[quake3-commits] r2134 - trunk/code/qcommon

[DONOTREPLY at icculus.org]

Author: thilo
Date: 2011-08-05 08:11:27 -0400 (Fri, 05 Aug 2011)
New Revision: 2134

Modified:
   trunk/code/qcommon/q_platform.h
   trunk/code/qcommon/q_shared.h
Log:
Fix compilation on non-x86 platforms, by Simon McVittie


Modified: trunk/code/qcommon/q_platform.h
===================================================================
--- trunk/code/qcommon/q_platform.h	2011-08-05 08:28:01 UTC (rev 2133)
+++ trunk/code/qcommon/q_platform.h	2011-08-05 12:11:27 UTC (rev 2134)
@@ -348,6 +348,8 @@
 
 
 //endianness
+void CopyShortSwap (void *dest, void *src);
+void CopyLongSwap (void *dest, void *src);
 short ShortSwap (short l);
 int LongSwap (int l);
 float FloatSwap (const float *f);

Modified: trunk/code/qcommon/q_shared.h
===================================================================
--- trunk/code/qcommon/q_shared.h	2011-08-05 08:28:01 UTC (rev 2133)
+++ trunk/code/qcommon/q_shared.h	2011-08-05 12:11:27 UTC (rev 2134)
@@ -443,7 +443,9 @@
   extern int (QDECL *Q_VMftol)(void);
   extern void (QDECL *Q_SnapVector)(vec3_t vec);
 #else
-  #define Q_ftol(f) lrintf((f))
+  // Q_ftol must expand to a function name so the pluggable renderer can take
+  // its address
+  #define Q_ftol lrintf
   #define Q_SnapVector(vec)\
 	do\
 	{\