From ec846d23b238907576c53e575165cf2e091b211b Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <ludwig.nussel@suse.de>
Date: Tue, 5 May 2009 18:19:29 +0000
Subject: [PATCH] define STRING and XSTRING in q_shared.h (#4054)

---
 code/qcommon/common.c   | 2 --
 code/qcommon/q_shared.h | 4 ++++
 code/sys/sys_main.c     | 2 --
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index 7cdfa856..e8a95a5a 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -40,8 +40,6 @@ int demo_protocols[] =
 #define MIN_COMHUNKMEGS		56
 #define DEF_COMHUNKMEGS		64
 #define DEF_COMZONEMEGS		24
-#define XSTRING(x)				STRING(x)
-#define STRING(x)					#x
 #define DEF_COMHUNKMEGS_S	XSTRING(DEF_COMHUNKMEGS)
 #define DEF_COMZONEMEGS_S	XSTRING(DEF_COMZONEMEGS)
 
diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
index 54b8bfbf..99edd69b 100644
--- a/code/qcommon/q_shared.h
+++ b/code/qcommon/q_shared.h
@@ -174,6 +174,10 @@ typedef int		clipHandle_t;
 #define NULL ((void *)0)
 #endif
 
+#define STRING(s)			#s
+// expand constants before stringifying them
+#define XSTRING(s)			STRING(s)
+
 #define	MAX_QINT			0x7fffffff
 #define	MIN_QINT			(-MAX_QINT-1)
 
diff --git a/code/sys/sys_main.c b/code/sys/sys_main.c
index f2a05e61..eb49326d 100644
--- a/code/sys/sys_main.c
+++ b/code/sys/sys_main.c
@@ -517,8 +517,6 @@ int main( int argc, char **argv )
 	// Run time
 	const SDL_version *ver = SDL_Linked_Version( );
 
-#define STRING(s) #s
-#define XSTRING(s) STRING(s)
 #define MINSDL_VERSION \
 	XSTRING(MINSDL_MAJOR) "." \
 	XSTRING(MINSDL_MINOR) "." \