From 6793c30712cf9af0e510b49b286508caed787883 Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Thu, 27 Jul 2017 14:32:31 +0000 Subject: [PATCH] change QUAKESPASM_VER_SUFFIX to be a string literal and adjust QUAKESPASM_VER_STRING for it. revise the QS_STRINGIFY macros. fixes "the not enough actual parameters for macro QS_STRINGIFY" warnings from my VS2005. git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1436 af15c1b1-3010-417e-b628-4374ebc0bcbd --- Quake/quakedef.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Quake/quakedef.h b/Quake/quakedef.h index c1910773..9e275841 100644 --- a/Quake/quakedef.h +++ b/Quake/quakedef.h @@ -39,14 +39,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define QUAKESPASM_VERSION 0.92 #define QUAKESPASM_VER_PATCH 2 // helper to print a string like 0.92.1 #ifndef QUAKESPASM_VER_SUFFIX -#define QUAKESPASM_VER_SUFFIX // optional version suffix like -beta1 +#define QUAKESPASM_VER_SUFFIX // optional version suffix string literal like "-beta1" #endif -#define QS_STRINGIFY2(x) QS_STRINGIFY(x) -#define QS_STRINGIFY(x) #x +#define QS_STRINGIFY_(x) #x +#define QS_STRINGIFY(x) QS_STRINGIFY_(x) // combined version string like "0.92.1-beta1" -#define QUAKESPASM_VER_STRING QS_STRINGIFY2(QUAKESPASM_VERSION) "." QS_STRINGIFY2(QUAKESPASM_VER_PATCH) QS_STRINGIFY2(QUAKESPASM_VER_SUFFIX) +#define QUAKESPASM_VER_STRING QS_STRINGIFY(QUAKESPASM_VERSION) "." QS_STRINGIFY(QUAKESPASM_VER_PATCH) QUAKESPASM_VER_SUFFIX //define PARANOID // speed sapping error checking