From: sfan5 <sfan5@live.de>
Date: Thu, 24 Jul 2014 11:04:35 +0000 (+0200)
Subject: Don't include cmake_config_githash.h into files that don't need it
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=5357a17bac1a3e4070e1529be1eaae57a48ed524;p=zefram%2Fminetest%2Fminetest_engine.git

Don't include cmake_config_githash.h into files that don't need it
---

diff --git a/src/config.h b/src/config.h
index 54c13d44..510c5ef1 100644
--- a/src/config.h
+++ b/src/config.h
@@ -74,11 +74,5 @@
 	#define VERSION_EXTRA_STRING CMAKE_VERSION_EXTRA_STRING
 #endif
 
-#ifdef __ANDROID__
-	#include "android_version.h"
-#else
-	#include "cmake_config_githash.h"
-#endif
-
 #endif
 
diff --git a/src/convert_json.cpp b/src/convert_json.cpp
index e79103a1..c5c69d93 100644
--- a/src/convert_json.cpp
+++ b/src/convert_json.cpp
@@ -27,7 +27,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "log.h"
 #include "main.h" // for g_settings
 #include "settings.h"
-#include "version.h"
 #include "httpfetch.h"
 #include "porting.h"
 
diff --git a/src/version.h b/src/version.h
index 0143d91a..6a10a9d4 100644
--- a/src/version.h
+++ b/src/version.h
@@ -21,6 +21,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define VERSION_HEADER
 
 #include "config.h"
+#ifdef __ANDROID__
+	#include "android_version.h"
+#else
+	#include "cmake_config_githash.h"
+#endif
 
 extern const char *minetest_version_simple;
 extern const char *minetest_version_hash;