aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorVincent Bénony2016-01-06 16:19:03 +0100
committerVincent Bénony2016-01-06 16:19:03 +0100
commit64f50761ec22243fe9964271a8554c9f3356a6b5 (patch)
treec4aa7991cad01deaa5f8a7683938d4899ff450d0 /common
parentfae79955e5ce6e215dcf457059c5744a85c76a80 (diff)
parent3fab9056296fbf491372f66f7fbb23d6312ad2ad (diff)
downloadscummvm-rg350-64f50761ec22243fe9964271a8554c9f3356a6b5.tar.gz
scummvm-rg350-64f50761ec22243fe9964271a8554c9f3356a6b5.tar.bz2
scummvm-rg350-64f50761ec22243fe9964271a8554c9f3356a6b5.zip
IOS: Merge master
Diffstat (limited to 'common')
-rw-r--r--common/scummsys.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/common/scummsys.h b/common/scummsys.h
index b8cf7678a4..7c2978f173 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -23,8 +23,8 @@
#ifndef COMMON_SCUMMSYS_H
#define COMMON_SCUMMSYS_H
-#ifndef __has_feature // Optional of course.
- #define __has_feature(x) 0 // Compatibility with non-clang compilers.
+#ifndef __has_feature // Optional of course.
+ #define __has_feature(x) 0 // Compatibility with non-clang compilers.
#endif
// This is a convenience macro to test whether the compiler used is a GCC
@@ -367,11 +367,11 @@
#endif
#ifndef STRINGBUFLEN
- #if defined(__N64__) || defined(__DS__)
- #define STRINGBUFLEN 256
- #else
- #define STRINGBUFLEN 1024
- #endif
+ #if defined(__N64__) || defined(__DS__)
+ #define STRINGBUFLEN 256
+ #else
+ #define STRINGBUFLEN 1024
+ #endif
#endif
#ifndef MAXPATHLEN