From 6f85c247e3817e30dd9249f84ec31c57b6a5f0c6 Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <ludwig.nussel@suse.de>
Date: Tue, 6 Nov 2007 16:41:57 +0000
Subject: [PATCH] Don't define ELF, use __ELF__ instead

---
 Makefile        | 2 +-
 code/asm/qasm.h | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 88ee1494..f04f8e62 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 c32aafcb..b02a60a2 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