From eef1b6891a10d35db312ac09c1796d30e336561c Mon Sep 17 00:00:00 2001
From: ludwig <ludwig@edf5b092-35ff-0310-97b2-ce42778d08ea>
Date: Tue, 6 Nov 2007 16:41:57 +0000
Subject: Don't define ELF, use __ELF__ instead

git-svn-id: svn://svn.icculus.org/quake3/trunk@1207 edf5b092-35ff-0310-97b2-ce42778d08ea
---
 Makefile        | 2 +-
 code/asm/qasm.h | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 88ee149..f04f8e6 100644
--- a/Makefile
+++ b/Makefile
@@ -835,7 +835,7 @@ endef
 
 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
diff --git a/code/asm/qasm.h b/code/asm/qasm.h
index c32aafc..b02a60a 100644
--- a/code/asm/qasm.h
+++ b/code/asm/qasm.h
@@ -24,15 +24,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "../qcommon/q_platform.h"
 
-#if defined(__MINGW32__) || defined(MACOS_X)
-#undef ELF
-#endif
-
 #ifdef __ELF__
 .section .note.GNU-stack,"",@progbits
 #endif
 
-#ifdef ELF
+#ifdef __ELF__
 #define C(label) label
 #else
 #define C(label) _##label
-- 
cgit v1.2.3