SF.net SVN: frontierkernel: [1291] Frontier/trunk/Common/source/langtree.c

[<has...@us...>]

Revision: 1291
Author:   hasseily
Date:     2006-04-17 08:09:49 -0700 (Mon, 17 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/frontierkernel/?rev=1291&view=rev

Log Message:
-----------
Fixed endian issues with Intel Macs. It's not acceptable to check for WIN95VERSION when dealing with endianness any more.

Modified Paths:
--------------
    Frontier/trunk/Common/source/langtree.c
Modified: Frontier/trunk/Common/source/langtree.c
===================================================================
--- Frontier/trunk/Common/source/langtree.c	2006-04-17 10:53:56 UTC (rev 1290)
+++ Frontier/trunk/Common/source/langtree.c	2006-04-17 15:09:49 UTC (rev 1291)
@@ -38,12 +38,11 @@
 
 typedef struct tydisktreenode {
 
-#ifdef MACVERSION
+#ifdef SWAP_BYTE_ORDER
+	short nodetype;	/*low byte will coincide with MAC enum*/
+#else
 	tytreetype nodetype; /*add, subtract, if, etc.*/
 #endif
-#ifdef WIN95VERSION
-	short nodetype;	/*low byte will coincide with MAC enum*/
-#endif
 
 	long nodevalsize;
 	
@@ -70,7 +69,15 @@
 
 typedef enum tydisktreenodeparaminfo {
 
-#ifdef MACVERSION
+#ifdef SWAP_BYTE_ORDER
+	ctparams_mask = 0x00f0,
+	ctparams_1 = 0x0010,
+	hasparam1_mask = 0x0008,
+	hasparam2_mask = 0x0004,
+	hasparam3_mask = 0x0002,
+	hasparam4_mask = 0x0001,
+	haslink_mask = 0x8000
+#else
 	ctparams_mask = 0xf000,
 	ctparams_1 = 0x1000,
 	hasparam1_mask = 0x0800,
@@ -79,16 +86,6 @@
 	hasparam4_mask = 0x0100,
 	haslink_mask = 0x0080
 #endif
-
-#ifdef WIN95VERSION
-	ctparams_mask = 0x00f0,
-	ctparams_1 = 0x0010,
-	hasparam1_mask = 0x0008,
-	hasparam2_mask = 0x0004,
-	hasparam3_mask = 0x0002,
-	hasparam4_mask = 0x0001,
-	haslink_mask = 0x8000
-#endif
 	} tydisktreenodeparaminfo;
 
 
@@ -108,10 +105,10 @@
 
 typedef struct tyOLD42disktreenode {
 
-	#ifdef MACVERSION
+	#ifdef __BIG_ENDIAN__
 	tytreetype nodetype; /*add, subtract, if, etc.*/
 	#endif
-	#ifdef WIN95VERSION
+	#ifdef __LITTLE_ENDIAN__
 	short nodetype;
 	#endif
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.