From: Simon Wilkinson <sxw@your-file-system.com>
Date: Sun, 29 Jul 2012 19:14:11 +0000 (-0400)
Subject: Windows: Rename cm_btree struct data
X-Git-Tag: upstream/1.8.0_pre1^2~2134
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=8c01141ccaa538b182ee79ec2d8ed5ec12b58f11;p=packages%2Fo%2Fopenafs.git

Windows: Rename cm_btree struct data

Rename the "struct data" in cm_btree.h to something less generic in
order to avoid conflicts with other code.

Change-Id: I0580be084d508c195d767152af4f9a461cf0407e
Reviewed-on: http://gerrit.openafs.org/7898
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
---

diff --git a/src/WINNT/afsd/cm_btree.h b/src/WINNT/afsd/cm_btree.h
index 7a7166e61..8a7f73363 100644
--- a/src/WINNT/afsd/cm_btree.h
+++ b/src/WINNT/afsd/cm_btree.h
@@ -78,7 +78,7 @@ typedef struct leaf {
     Nptr	nextNode;
 } Leaf;
 
-typedef struct data {
+typedef struct btree_data {
     keyT        key;
     dataT	value;
     Nptr        next;