(svn r13370) -Codechange: move the VARDEF stuff from openttd.h to variables.h so one doesn't need to include openttd.h before variables.h.
authorrubidium
Tue, 03 Jun 2008 08:06:58 +0000
changeset 9452 d901f00aeed6
parent 9451 0d6806ba5504
child 9453 0d9a6bee8bf3
(svn r13370) -Codechange: move the VARDEF stuff from openttd.h to variables.h so one doesn't need to include openttd.h before variables.h.
src/network/network_internal.h
src/openttd.h
src/variables.h
--- a/src/network/network_internal.h	Tue Jun 03 08:04:35 2008 +0000
+++ b/src/network/network_internal.h	Tue Jun 03 08:06:58 2008 +0000
@@ -93,8 +93,6 @@
 	NETLANG_COUNT
 };
 
-#define VARDEF extern
-
 extern NetworkPlayerInfo _network_player_info[MAX_PLAYERS];
 
 extern uint32 _frame_counter_server; // The frame_counter of the server, if in network-mode
--- a/src/openttd.h	Tue Jun 03 08:04:35 2008 +0000
+++ b/src/openttd.h	Tue Jun 03 08:06:58 2008 +0000
@@ -5,10 +5,6 @@
 #ifndef OPENTTD_H
 #define OPENTTD_H
 
-#ifndef VARDEF
-#define VARDEF extern
-#endif
-
 enum GameModes {
 	GM_MENU,
 	GM_NORMAL,
--- a/src/variables.h	Tue Jun 03 08:04:35 2008 +0000
+++ b/src/variables.h	Tue Jun 03 08:06:58 2008 +0000
@@ -5,6 +5,10 @@
 #ifndef VARIABLES_H
 #define VARIABLES_H
 
+#ifndef VARDEF
+#define VARDEF extern
+#endif
+
 /* Amount of game ticks */
 VARDEF uint16 _tick_counter;