aboutsummaryrefslogtreecommitdiff
path: root/devtools/create_translations
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2013-09-30 22:05:32 +0200
committerWillem Jan Palenstijn2013-09-30 22:05:32 +0200
commit8e58be7a1d39d8235ddd7beb876de1ff3988fca5 (patch)
tree64cebc37a319e17299a6a37a8b13b35742174d58 /devtools/create_translations
parent057b01951a92cc17e6c7a5121d2bd866841c4f75 (diff)
parent17df6b343a0fdb2168b4d3a22927cd0f584ce735 (diff)
downloadscummvm-rg350-8e58be7a1d39d8235ddd7beb876de1ff3988fca5.tar.gz
scummvm-rg350-8e58be7a1d39d8235ddd7beb876de1ff3988fca5.tar.bz2
scummvm-rg350-8e58be7a1d39d8235ddd7beb876de1ff3988fca5.zip
Merge branch 'master' into wme_rendering
Diffstat (limited to 'devtools/create_translations')
-rw-r--r--devtools/create_translations/create_translations.cpp3
-rw-r--r--devtools/create_translations/create_translations.h4
2 files changed, 6 insertions, 1 deletions
diff --git a/devtools/create_translations/create_translations.cpp b/devtools/create_translations/create_translations.cpp
index a153632c47..a8b04a7a52 100644
--- a/devtools/create_translations/create_translations.cpp
+++ b/devtools/create_translations/create_translations.cpp
@@ -22,6 +22,8 @@
* The generated files is used by ScummVM to propose translation of its GUI.
*/
+#include "create_translations.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -34,7 +36,6 @@
#undef main
#endif // main
-#include "create_translations.h"
#include "po_parser.h"
#include "cp_parser.h"
diff --git a/devtools/create_translations/create_translations.h b/devtools/create_translations/create_translations.h
index 9ccbd39b2b..1df01e6333 100644
--- a/devtools/create_translations/create_translations.h
+++ b/devtools/create_translations/create_translations.h
@@ -28,4 +28,8 @@ typedef unsigned short uint16;
typedef unsigned int uint32;
typedef signed short int16;
+#ifndef __has_feature // Optional of course.
+ #define __has_feature(x) 0 // Compatibility with non-clang compilers.
+#endif
+
#endif /* CREATE_TRANSLATIONS_H */