- Merge DUMB commit d31fb2084659b64d07eb0644d9bacfd67059d066 to zdoom.

Fixed C++11 compilation error on Mac OS X
This commit is contained in:
Edoardo Prezioso 2013-08-25 02:11:44 +02:00 committed by Randy Heit
parent 1b79f7d956
commit ded1715625

View file

@ -44,7 +44,7 @@
#define DUMB_VERSION_STR "0.9.3" #define DUMB_VERSION_STR "0.9.3"
#define DUMB_NAME "DUMB v"DUMB_VERSION_STR #define DUMB_NAME "DUMB v" DUMB_VERSION_STR
#define DUMB_YEAR 2005 #define DUMB_YEAR 2005
#define DUMB_MONTH 8 #define DUMB_MONTH 8
@ -56,13 +56,13 @@
#define DUMB_DAY_STR1 "7" #define DUMB_DAY_STR1 "7"
#if DUMB_MONTH < 10 #if DUMB_MONTH < 10
#define DUMB_MONTH_STR2 "0"DUMB_MONTH_STR1 #define DUMB_MONTH_STR2 "0" DUMB_MONTH_STR1
#else #else
#define DUMB_MONTH_STR2 DUMB_MONTH_STR1 #define DUMB_MONTH_STR2 DUMB_MONTH_STR1
#endif #endif
#if DUMB_DAY < 10 #if DUMB_DAY < 10
#define DUMB_DAY_STR2 "0"DUMB_DAY_STR1 #define DUMB_DAY_STR2 "0" DUMB_DAY_STR1
#else #else
#define DUMB_DAY_STR2 DUMB_DAY_STR1 #define DUMB_DAY_STR2 DUMB_DAY_STR1
#endif #endif
@ -74,7 +74,7 @@
*/ */
#define DUMB_DATE (DUMB_YEAR*10000 + DUMB_MONTH*100 + DUMB_DAY) #define DUMB_DATE (DUMB_YEAR*10000 + DUMB_MONTH*100 + DUMB_DAY)
#define DUMB_DATE_STR DUMB_DAY_STR1"."DUMB_MONTH_STR1"."DUMB_YEAR_STR4 #define DUMB_DATE_STR DUMB_DAY_STR1 "." DUMB_MONTH_STR1 "." DUMB_YEAR_STR4
#undef MIN #undef MIN