Fix #if macros for idx64 and id386

ioquake · Jun 15, 2011 · a447aa8 · a447aa8
1 parent a503584
commit a447aa8
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 47 deletions.
diff --git a/code/asm/qasm-inline.h b/code/asm/qasm-inline.h
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "../qcommon/q_platform.h"
 
-#ifdef idx64
+#if idx64
   #define EAX "%%rax"
   #define EBX "%%rbx"
   #define ESP "%%rsp"

diff --git a/code/qcommon/common.c b/code/qcommon/common.c
@@ -90,9 +90,9 @@ cvar_t	*com_basegame;
 cvar_t  *com_homepath;
 cvar_t	*com_busyWait;
 
-#if defined(idx64) 
+#if idx64
   void (*Q_VMftol)(void);
-#elif defined(id386)
+#elif id386
 	long (QDECL *Q_ftol)(float f);
 	void (QDECL *Q_VMftol)(void);
 	void (QDECL *Q_SnapVector)(vec3_t vec);
@@ -2580,11 +2580,11 @@ Find out whether we have SSE support for Q_ftol function
 =================
 */
 
-#if defined(id386) || defined(idx64)
+#if id386 || idx64
 
 static void Com_DetectSSE(void)
 {
-#ifndef idx64
+#if !idx64
 	cpuFeatures_t feat;
 
 	feat = Sys_GetProcessorFeatures();
@@ -2601,7 +2601,7 @@ static void Com_DetectSSE(void)
 		Q_VMftol = qvmftolsse;
 
 		Com_Printf("Have SSE support\n");
-#ifndef idx64
+#if !idx64
 	}
 	else
 	{

diff --git a/code/qcommon/q_platform.h b/code/qcommon/q_platform.h
@@ -24,6 +24,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define __Q_PLATFORM_H
 
 // this is for determining if we have an asm version of a C function
+#define idx64 0
+
 #ifdef Q3_VM
 
 #define id386 0
@@ -76,7 +78,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #if defined(_WIN64) || defined(__WIN64__)
 
-#define idx64
+#undef idx64
+#define idx64 1
 
 #undef QDECL
 #define QDECL __cdecl
@@ -146,7 +149,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define ARCH_STRING "i386"
 #define Q3_LITTLE_ENDIAN
 #elif defined __x86_64__
-#define idx64
+#undef idx64
+#define idx64 1
 #define ARCH_STRING "x86_64"
 #define Q3_LITTLE_ENDIAN
 #endif
@@ -173,7 +177,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #if defined __i386__
 #define ARCH_STRING "i386"
 #elif defined __x86_64__
-#define idx64
+#undef idx64
+#define idx64 1
 #define ARCH_STRING "x86_64"
 #elif defined __powerpc64__
 #define ARCH_STRING "ppc64"
@@ -236,7 +241,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #ifdef __i386__
 #define ARCH_STRING "i386"
 #elif defined __amd64__
-#define idx64
+#undef idx64
+#define idx64 1
 #define ARCH_STRING "amd64"
 #elif defined __axp__
 #define ARCH_STRING "alpha"

diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
@@ -421,7 +421,7 @@ extern	vec3_t	axisDefault[3];
 
 int Q_isnan(float x);
 
-#ifdef idx64
+#if idx64
   extern long qftolsse(float f);
   extern void qvmftolsse(void);
   extern void qsnapvectorsse(vec3_t vec);
@@ -430,7 +430,7 @@ int Q_isnan(float x);
   #define Q_SnapVector qsnapvectorsse
 
   extern void (*Q_VMftol)(void);
-#elif defined(id386)
+#elif id386
   extern long QDECL qftolx87(float f);
   extern long QDECL qftolsse(float f);
   extern void QDECL qvmftolx87(void);