r1207 - in trunk: . code/asm

[DONOTREPLY at icculus.org]

Author: ludwig
Date: 2007-11-06 11:41:57 -0500 (Tue, 06 Nov 2007)
New Revision: 1207

Modified:
   trunk/Makefile
   trunk/code/asm/qasm.h
Log:
Don't define ELF, use __ELF__ instead


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2007-11-03 21:53:50 UTC (rev 1206)
+++ trunk/Makefile	2007-11-06 16:41:57 UTC (rev 1207)
@@ -835,7 +835,7 @@
 
 define DO_AS
 $(echo_cmd) "AS $<"
-$(Q)$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
+$(Q)$(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
 endef
 
 define DO_DED_CC

Modified: trunk/code/asm/qasm.h
===================================================================
--- trunk/code/asm/qasm.h	2007-11-03 21:53:50 UTC (rev 1206)
+++ trunk/code/asm/qasm.h	2007-11-06 16:41:57 UTC (rev 1207)
@@ -24,15 +24,11 @@
 
 #include "../qcommon/q_platform.h"
 
-#if defined(__MINGW32__) || defined(MACOS_X)
-#undef ELF
-#endif
-
 #ifdef __ELF__
 .section .note.GNU-stack,"", at progbits
 #endif
 
-#ifdef ELF
+#ifdef __ELF__
 #define C(label) label
 #else
 #define C(label) _##label