Visual C++ compilation fixes

This commit is contained in:
Bertrand Songis
2016-03-10 22:39:51 +01:00
parent 64cd872055
commit 41a6e7c4ab
4 changed files with 12 additions and 9 deletions
+5 -5
View File
@@ -41,15 +41,15 @@ union ZoneOptionValue
};
#if defined(_MSC_VER)
#define OPTION_DEFAULT_VALUE_UNSIGNED(x) { uint32_t(x) }
#define OPTION_DEFAULT_VALUE_SIGNED(x) { uint32_t(x) }
#define OPTION_DEFAULT_VALUE_BOOL(x) { uint32_t(x) }
#define OPTION_DEFAULT_VALUE_STRING(...) { *((ZoneOptionValue *)(const char []) __VA_ARGS__) }
#define OPTION_DEFAULT_VALUE_UNSIGNED(x) uint32_t(x)
#define OPTION_DEFAULT_VALUE_SIGNED(x) uint32_t(x)
#define OPTION_DEFAULT_VALUE_BOOL(x) uint32_t(x)
#define OPTION_DEFAULT_VALUE_STRING(...) *(ZoneOptionValue *)(const char *)__VA_ARGS__
#else
#define OPTION_DEFAULT_VALUE_UNSIGNED(x) { .unsignedValue = (x) }
#define OPTION_DEFAULT_VALUE_SIGNED(x) { .signedValue = (x) }
#define OPTION_DEFAULT_VALUE_BOOL(x) { .boolValue = (x) }
#define OPTION_DEFAULT_VALUE_STRING(...) { .stringValue = __VA_ARGS__}
#define OPTION_DEFAULT_VALUE_STRING(...) { .stringValue = *(ZoneOptionValue *)(const char *)__VA_ARGS__ }
#endif
struct ZoneOption