Merge https://github.com/nigels-com/glew.git into master HEAD at Wed …

…Mar 20 02:44:18 GMT 2019
Perlmint · Mar 20, 2019 · 9cc72c5 · 9cc72c5
2 parents e6d6769 + 3565eac
commit 9cc72c5
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/auto/src/glew_head.h b/auto/src/glew_head.h
@@ -140,15 +140,26 @@ typedef _W64 int ptrdiff_t;
  * (mem, 2004-01-04)
  */
 
-#include <stddef.h>
+#if defined(__APPLE__) || defined(__linux__)
+#  if defined(__cplusplus)
+#    include <cstddef>
+#    include <cstdint>
+#  else
+#    include <stddef.h>
+#    include <stdint.h>
+#  endif
+#else
+
+# include <stddef.h>
 
 /* SGI MIPSPro doesn't like stdint.h in C++ mode          */
 /* ID: 3376260 Solaris 9 has inttypes.h, but not stdint.h */
 
-#if (defined(__sgi) || defined(__sun)) && !defined(__GNUC__)
-#include <inttypes.h>
-#else
-#include <stdint.h>
+#  if (defined(__sgi) || defined(__sun)) && !defined(__GNUC__)
+#    include <inttypes.h>
+#  else
+#    include <stdint.h>
+#  endif
 #endif
 
 #define GLEW_APIENTRY_DEFINED