From 080bef10b815e56425721b487b79819872358193 Mon Sep 17 00:00:00 2001
From: Taylor Richards <taylor@icculus.org>
Date: Fri, 11 Jun 2004 21:39:44 +0000
Subject: [PATCH] x86 compile fixes for OSX patch

---
 include/pstypes.h       | 5 ++++-
 src/model/modelread.cpp | 9 ++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/include/pstypes.h b/include/pstypes.h
index f6a49a7..14e44c4 100644
--- a/include/pstypes.h
+++ b/include/pstypes.h
@@ -15,6 +15,9 @@
  * Header file containg global typedefs, constants and macros
  *
  * $Log$
+ * Revision 1.9  2004/06/11 21:39:44  taylor
+ * x86 compile fixes for OSX patch
+ *
  * Revision 1.8  2004/06/11 00:15:06  tigital
  * byte-swapping changes for bigendian systems
  *
@@ -593,7 +596,7 @@ float SWAPFLOAT( float *x )
 #if SDL_BYTEORDER != SDL_BIG_ENDIAN
 #define INTEL_INT(x)	x
 #define INTEL_SHORT(x)	x
-#define INTEL_FLOAT(x)	x
+#define INTEL_FLOAT(x)	(*x)
 #else
 #define INTEL_INT(x)	SWAPINT(x)
 #define INTEL_SHORT(x)	SWAPSHORT(x)
diff --git a/src/model/modelread.cpp b/src/model/modelread.cpp
index 31adfcc..19d048b 100644
--- a/src/model/modelread.cpp
+++ b/src/model/modelread.cpp
@@ -15,6 +15,9 @@
  * file which reads and deciphers POF information
  *
  * $Log$
+ * Revision 1.10  2004/06/11 21:39:44  taylor
+ * x86 compile fixes for OSX patch
+ *
  * Revision 1.9  2004/06/10 23:55:39  tigital
  * byte-swapping changes for bigendian systems
  *
@@ -1531,9 +1534,9 @@ int read_model_file(polymodel * pm, char *filename, int n_subsystems, model_subs
 				if ( pm->submodel[n].bsp_data_size > 0 )	{
 					pm->submodel[n].bsp_data = (ubyte *)malloc(pm->submodel[n].bsp_data_size);
 					cfread(pm->submodel[n].bsp_data,1,pm->submodel[n].bsp_data_size,fp);
-                    if (SDL_BYTEORDER == SDL_BIG_ENDIAN)		//tigital
-                        swap_bsp_data( pm, pm->submodel[n].bsp_data );
-                                        
+#if (SDL_BYTEORDER == SDL_BIG_ENDIAN)		//tigital
+					swap_bsp_data( pm, pm->submodel[n].bsp_data );
+#endif
 				} else {
 					pm->submodel[n].bsp_data = NULL;
 				}
-- 
2.39.2