Merge branch 'nasm-2.12.xx'

Resolved Conflicts:
	compiler.h

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

1 files changed, 0 insertions, 6 deletions

diff --git a/compiler.h b/compiler.h
index 310e79b9..baa8d197 100644
--- a/compiler.h
+++ b/compiler.h
@@ -72,12 +72,6 @@
 #define __STDC_LIMIT_MACROS	1
 #define __STDC_FORMAT_MACROS	1
 
-#ifdef __GNUC__
-# define _unused	__attribute__((unused))
-#else
-# define _unused
-#endif
-
 /* Some versions of MSVC have these only with underscores in front */
 #include <stddef.h>
 #include <stdarg.h>