(svn r6766) -Codechange: Move _openttd_revision[] into the functions that use it instead of global

5 files changed, 5 insertions, 10 deletions

diff --git a/network_client.c b/network_client.c
index 5dcef49c2..66532d28b 100644
--- a/network_client.c
+++ b/network_client.c
@@ -24,8 +24,6 @@
 // This file handles all the client-commands
 
 
-extern const char _openttd_revision[];
-
 // So we don't make too much typos ;)
 #define MY_CLIENT DEREF_CLIENT(0)
 
@@ -65,6 +63,7 @@ DEF_CLIENT_SEND_COMMAND(PACKET_CLIENT_JOIN)
 	//    String: Unique id to find the player back in server-listing
 	//
 
+	extern const char _openttd_revision[];
 	Packet *p;
 	_network_join_status = NETWORK_JOIN_STATUS_AUTHORIZING;
 	InvalidateWindow(WC_NETWORK_STATUS_WINDOW, 0);
diff --git a/openttd.c b/openttd.c
index e46b6a14c..5a2d76d7f 100644
--- a/openttd.c
+++ b/openttd.c
@@ -125,10 +125,9 @@ void *ReadFileToMem(const char *filename, size_t *lenp, size_t maxsize)
 	return mem;
 }
 
-extern const char _openttd_revision[];
-
 static void showhelp(void)
 {
+	extern const char _openttd_revision[];
 	char buf[4096], *p;
 
 	p    = buf;
diff --git a/strings.c b/strings.c
index 7166b28cf..7e20c2c01 100644
--- a/strings.c
+++ b/strings.c
@@ -37,8 +37,6 @@ static char *GetSpecialPlayerNameString(char *buff, int ind, const int32 *argv);
 
 static char *FormatString(char *buff, const char *str, const int32 *argv, uint casei);
 
-extern const char _openttd_revision[];
-
 typedef struct LanguagePack {
 	uint32 ident;
 	uint32 version;     // 32-bits of auto generated version info which is basically a hash of strings.h
@@ -568,6 +566,7 @@ static const Units units[] = {
 
 static char *FormatString(char *buff, const char *str, const int32 *argv, uint casei)
 {
+	extern const char _openttd_revision[];
 	byte b;
 	const int32 *argv_orig = argv;
 	uint modifier = 0;
diff --git a/video/sdl_v.c b/video/sdl_v.c
index b8b79b86b..5ffd33dbf 100644
--- a/video/sdl_v.c
+++ b/video/sdl_v.c
@@ -156,8 +156,6 @@ static void GetAvailableVideoMode(int *w, int *h)
 	*h = _resolutions[best][1];
 }
 
-extern const char _openttd_revision[];
-
 #ifndef ICON_DIR
 #define ICON_DIR "media"
 #endif
@@ -171,6 +169,7 @@ extern const char _openttd_revision[];
 
 static bool CreateMainSurface(int w, int h)
 {
+	extern const char _openttd_revision[];
 	SDL_Surface *newscreen, *icon;
 	char caption[50];
 
diff --git a/video/win32_v.c b/video/win32_v.c
index 05bc4d7a6..279fc4709 100644
--- a/video/win32_v.c
+++ b/video/win32_v.c
@@ -510,8 +510,6 @@ static void RegisterWndClass(void)
 	}
 }
 
-extern const char _openttd_revision[];
-
 static void MakeWindow(bool full_screen)
 {
 	_fullscreen = full_screen;
@@ -572,6 +570,7 @@ static void MakeWindow(bool full_screen)
 			ShowWindow(_wnd.main_wnd, SW_SHOWNORMAL); // remove maximize-flag
 			SetWindowPos(_wnd.main_wnd, 0, x, y, w, h, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOZORDER);
 		} else {
+			extern const char _openttd_revision[];
 			char Windowtitle[50];
 
 			snprintf(Windowtitle, lengthof(Windowtitle), "OpenTTD %s", _openttd_revision);