Merge branch 'master' into master

1 files changed, 14 insertions, 14 deletions

diff --git a/src/gettext.h b/src/gettext.h
index 42b375d86..b3f571afb 100644
--- a/src/gettext.h
+++ b/src/gettext.h
@@ -23,27 +23,27 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <string>
 
 #if USE_GETTEXT
-	#include <libintl.h>
+#include <libintl.h>
 #else
-	// In certain environments, some standard headers like <iomanip>
-	// and <locale> include libintl.h. If libintl.h is included after
-	// we define our gettext macro below, this causes a syntax error
-	// at the declaration of the gettext function in libintl.h.
-	// Fix this by including such a header before defining the macro.
-	// See issue #4446.
-	// Note that we can't include libintl.h directly since we're in
-	// the USE_GETTEXT=0 case and can't assume that gettext is installed.
-	#include <locale>
-
-	#define gettext(String) String
+// In certain environments, some standard headers like <iomanip>
+// and <locale> include libintl.h. If libintl.h is included after
+// we define our gettext macro below, this causes a syntax error
+// at the declaration of the gettext function in libintl.h.
+// Fix this by including such a header before defining the macro.
+// See issue #4446.
+// Note that we can't include libintl.h directly since we're in
+// the USE_GETTEXT=0 case and can't assume that gettext is installed.
+#include <locale>
+
+#define gettext(String) String
 #endif
 
 #define _(String) gettext(String)
 #define gettext_noop(String) (String)
 #define N_(String) gettext_noop((String))
 
-void init_gettext(const char *path, const std::string &configured_language,
-	int argc, char *argv[]);
+void init_gettext(const char *path, const std::string &configured_language, int argc,
+		char *argv[]);
 
 extern wchar_t *utf8_to_wide_c(const char *str);