Fixes for clang

pllim · Oct 28, 2014 · 3147d8d · 3147d8d
1 parent 7ac0f2b
commit 3147d8d
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 20 deletions.
diff --git a/extern/ttconv/pprdrv_tt.cpp b/extern/ttconv/pprdrv_tt.cpp
@@ -31,6 +31,12 @@
 #include "pprdrv.h"
 #include "truetype.h"
 #include <sstream>
+#ifdef _POSIX_C_SOURCE
+#    undef _POSIX_C_SOURCE
+#endif
+#ifdef _XOPEN_SOURCE
+#    undef _XOPEN_SOURCE
+#endif
 #include <Python.h>
 
 /*==========================================================================

diff --git a/src/_backend_agg_wrapper.cpp b/src/_backend_agg_wrapper.cpp
@@ -670,10 +670,7 @@ extern "C" {
 
 struct module_state
 {
-/* The Sun compiler can't handle empty structs */
-#if defined(__SUNPRO_C) || defined(_MSC_VER)
     int _dummy;
-#endif
 };
 
 #if PY3K

diff --git a/src/_gtkagg.cpp b/src/_gtkagg.cpp
@@ -110,10 +110,7 @@ extern "C" {
 
     struct module_state
     {
-        /* The Sun compiler can't handle empty structs */
-#if defined(__SUNPRO_C) || defined(_MSC_VER)
         int _dummy;
-#endif
     };
 
 #if PY3K

diff --git a/src/_image_wrapper.cpp b/src/_image_wrapper.cpp
@@ -722,10 +722,7 @@ extern "C" {
 
 struct module_state
 {
-/* The Sun compiler can't handle empty structs */
-#if defined(__SUNPRO_C) || defined(_MSC_VER)
     int _dummy;
-#endif
 };
 
 #if PY3K

diff --git a/src/_path_wrapper.cpp b/src/_path_wrapper.cpp
@@ -669,10 +669,7 @@ extern "C" {
 
     struct module_state
     {
-        /* The Sun compiler can't handle empty structs */
-#if defined(__SUNPRO_C) || defined(_MSC_VER)
         int _dummy;
-#endif
     };
 
 #if PY3K

diff --git a/src/_png.cpp b/src/_png.cpp
@@ -490,10 +490,7 @@ extern "C" {
 
     struct module_state
     {
-        /* The Sun compiler can't handle empty structs */
-#if defined(__SUNPRO_C) || defined(_MSC_VER)
         int _dummy;
-#endif
     };
 
 #if PY3K

diff --git a/src/ft2font_wrapper.cpp b/src/ft2font_wrapper.cpp
@@ -1618,10 +1618,7 @@ extern "C" {
 
 struct module_state
 {
-/* The Sun compiler can't handle empty structs */
-#if defined(__SUNPRO_C) || defined(_MSC_VER)
     int _dummy;
-#endif
 };
 
 #if PY3K

diff --git a/src/mplutils.h b/src/mplutils.h
@@ -11,6 +11,13 @@ typedef unsigned __int8   uint8_t;
 #include <stdint.h>
 #endif
 
+#ifdef _POSIX_C_SOURCE
+#    undef _POSIX_C_SOURCE
+#endif
+#ifdef _XOPEN_SOURCE
+#    undef _XOPEN_SOURCE
+#endif
+
 #include <Python.h>
 
 #if PY_MAJOR_VERSION >= 3

diff --git a/src/numpy_cpp.h b/src/numpy_cpp.h
@@ -18,6 +18,13 @@
 
 #include <complex>
 
+#ifdef _POSIX_C_SOURCE
+#    undef _POSIX_C_SOURCE
+#endif
+#ifdef _XOPEN_SOURCE
+#    undef _XOPEN_SOURCE
+#endif
+
 #include <Python.h>
 #include <numpy/ndarrayobject.h>
 

diff --git a/src/py_converters.cpp b/src/py_converters.cpp
@@ -493,13 +493,13 @@ int convert_offset_position(PyObject *obj, void *offsetp)
     e_offset_position *offset = (e_offset_position *)offsetp;
     const char *names[] = {"data", NULL};
     int values[] = {OFFSET_POSITION_DATA};
-    int result = OFFSET_POSITION_FIGURE;
+    int result = (int)OFFSET_POSITION_FIGURE;
 
     if (!convert_string_enum(obj, "offset_position", names, values, &result)) {
         PyErr_Clear();
     }
 
-    *offset = result;
+    *offset = (e_offset_position)result;
 
     return 1;
 }