empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Work around for broken MSC C++ 6.0 (VC98) choking on empty macro arguments.

Browse source 
Fixed in MSC C++ 7.0.
This commit is contained in:
Ron Koenderink 2004-10-05 01:08:21 +00:00
parent d895fe1d00
commit 66c258b595
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
include/econfig-spec.h
View file

@ -27,6 +27,12 @@
* *
* econfig-spec.h: Combined include for optlist.h and emp_config.c * econfig-spec.h: Combined include for optlist.h and emp_config.c
*/ */
/*
* Preprocessor of MSC C++ 6.0 (VC98) is broken and chokes on empty
* macro arguments. Fixed in MSC C++ 7.0. Work around: pass
* useless token `unused'.
*/
#if defined(EMP_CONFIG_C_OUTPUT) #if defined(EMP_CONFIG_C_OUTPUT)
@ -44,7 +50,7 @@
#endif /* EMP_CONFIG_C_OUTPUT || EMP_CONFIG_H_OUTPUT */ #endif /* EMP_CONFIG_C_OUTPUT || EMP_CONFIG_H_OUTPUT */
#define EMPCF_COMMENT(comment) \ #define EMPCF_COMMENT(comment) \
EMPCFONLYC("", emp_config_dummy, , NSC_NOTYPE, 0, (comment)) EMPCFONLYC("", emp_config_dummy, unused , NSC_NOTYPE, 0, (comment))
/* things that can be changed */ /* things that can be changed */
EMPCF_COMMENT("\n### Server configuration and information") EMPCF_COMMENT("\n### Server configuration and information")
@ -98,8 +104,8 @@ EMPCFBOTH("game_hours", game_hours, char *, NSC_STRING, 0,
"Hours game is up and running (6:00-18:00)") "Hours game is up and running (6:00-18:00)")
EMPCF_COMMENT("\n\n### Options\n") EMPCF_COMMENT("\n\n### Options\n")
EMPCFONLYC("option", emp_config_dummy, , NSC_NOTYPE, 0, NULL) EMPCFONLYC("option", emp_config_dummy, unused , NSC_NOTYPE, 0, NULL)
EMPCFONLYC("nooption", emp_config_dummy, , NSC_NOTYPE, 0, NULL) EMPCFONLYC("nooption", emp_config_dummy, unused , NSC_NOTYPE, 0, NULL)
EMPCF_COMMENT("\n\n### Countries") EMPCF_COMMENT("\n\n### Countries")