Author: pepeto
Date: Tue Jan 13 16:38:00 2015
New Revision: 27662
URL: http://svn.gna.org/viewcvs/freeciv?rev=27662&view=rev
Log:
Force usage of semicolon after fc_assert_XXX().
See gna patch #5697
Modified:
branches/S2_6/utility/log.h
Modified: branches/S2_6/utility/log.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/log.h?rev=27662&r1=27661&r2=27662&view=diff
==============================================================================
--- branches/S2_6/utility/log.h (original)
+++ branches/S2_6/utility/log.h Tue Jan 13 16:38:00 2015
@@ -132,7 +132,8 @@
fc_assert_fail(file, function, line, #condition, \
message, ## __VA_ARGS__); \
action; \
- }
+ } \
+ (void) 0 /* Force the usage of ';' at the end of the call. */
#ifdef NDEBUG
/* Disabled. */
@@ -178,7 +179,7 @@
/* Exit on failure with extra message. */
#define fc_assert_exit_msg(condition, message, ...) \
fc_assert_action(condition, \
- log_fatal(message, ## __VA_ARGS__); exit(EXIT_FAILURE));
+ log_fatal(message, ## __VA_ARGS__); exit(EXIT_FAILURE))
#ifdef __cplusplus
#ifdef CXX11_STATIC_ASSERT
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
