Author: cazfi
Date: Wed Jan 27 21:28:00 2016
New Revision: 31642
URL: http://svn.gna.org/viewcvs/freeciv?rev=31642&view=rev
Log:
Always use FREECIV_DEBUG instead of DEBUG in headers.
See patch #6856
Modified:
branches/S2_6/client/client_main.h
branches/S2_6/common/map.h
Modified: branches/S2_6/client/client_main.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/client_main.h?rev=31642&r1=31641&r2=31642&view=diff
==============================================================================
--- branches/S2_6/client/client_main.h (original)
+++ branches/S2_6/client/client_main.h Wed Jan 27 21:28:00 2016
@@ -81,9 +81,9 @@
extern bool auto_spawn;
extern bool waiting_for_end_turn;
-#ifdef DEBUG
+#ifdef FREECIV_DEBUG
extern bool hackless;
-#endif
+#endif /* FREECIV_DEBUG */
struct global_worklist_list; /* Defined in global_worklist.[ch]. */
Modified: branches/S2_6/common/map.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/map.h?rev=31642&r1=31641&r2=31642&view=diff
==============================================================================
--- branches/S2_6/common/map.h (original)
+++ branches/S2_6/common/map.h Wed Jan 27 21:28:00 2016
@@ -126,18 +126,18 @@
/* Number of index coordinates (for sanity checks and allocations) */
#define MAP_INDEX_SIZE (game.map.xsize * game.map.ysize)
-#ifdef DEBUG
+#ifdef FREECIV_DEBUG
#define CHECK_MAP_POS(x,y) \
fc_assert(is_normal_map_pos((x),(y)))
#define CHECK_NATIVE_POS(x, y) \
fc_assert((x) >= 0 && (x) < game.map.xsize && (y) >= 0 && (y) <
game.map.ysize)
#define CHECK_INDEX(index) \
fc_assert((index) >= 0 && (index) < MAP_INDEX_SIZE)
-#else
+#else /* FREECIV_DEBUG */
#define CHECK_MAP_POS(x,y) ((void)0)
#define CHECK_NATIVE_POS(x, y) ((void)0)
#define CHECK_INDEX(index) ((void)0)
-#endif
+#endif /* FREECIV_DEBUG */
#define native_pos_to_index_nocheck(nat_x, nat_y) \
((nat_x) + (nat_y) * game.map.xsize)
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
