Merge pull request #343 from haberman/msvc

MSVC apparently doesn't support the standard C/C++ defines.
4 years ago · 3e071ea91a
parent 963e501aa6 e70e488e09
commit 3e071ea91a
1 changed files with 4 additions and 6 deletions
--- a/upb/port_def.inc
+++ b/upb/port_def.inc
@ -21,12 +21,10 @@
 * This file is private and must not be included by users!
 */

-#if !(__STDC_VERSION__ >= 199901L || __cplusplus >= 201103L)
-#error upb requires C99 or C++11
-#endif
-
-#if (defined(_MSC_VER) && _MSC_VER < 1900)
-#error upb requires MSVC >= 2015.
+#if !((defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \
+      (defined(__cplusplus) && __cplusplus >= 201103L) ||           \
+      (defined(_MSC_VER) && _MSC_VER >= 1900))
+#error upb requires C99 or C++11 or MSVC >= 2015.
 #endif

 #include <stdint.h>