Fixes for clang

mdboom · mdboom · commit 3147d8d8566f · 2014-10-28T12:08:52.000-04:00
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;
 }

Original file line number	Diff line number	Diff line change
`@@ -670,10 +670,7 @@ extern "C" {`
`670`	`670`
`671`	`671`	`struct module_state`
`672`	`672`	`{`
`673`		`-/* The Sun compiler can't handle empty structs */`
`674`		`-#if defined(__SUNPRO_C) \|\| defined(_MSC_VER)`
`675`	`673`	`int _dummy;`
`676`		`-#endif`
`677`	`674`	`};`
`678`	`675`
`679`	`676`	`#if PY3K`
Original file line number	Diff line number	Diff line change
`@@ -110,10 +110,7 @@ extern "C" {`
`110`	`110`
`111`	`111`	`struct module_state`
`112`	`112`	`{`
`113`		`- /* The Sun compiler can't handle empty structs */`
`114`		`-#if defined(__SUNPRO_C) \|\| defined(_MSC_VER)`
`115`	`113`	`int _dummy;`
`116`		`-#endif`
`117`	`114`	`};`
`118`	`115`
`119`	`116`	`#if PY3K`
Original file line number	Diff line number	Diff line change
`@@ -722,10 +722,7 @@ extern "C" {`
`722`	`722`
`723`	`723`	`struct module_state`
`724`	`724`	`{`
`725`		`-/* The Sun compiler can't handle empty structs */`
`726`		`-#if defined(__SUNPRO_C) \|\| defined(_MSC_VER)`
`727`	`725`	`int _dummy;`
`728`		`-#endif`
`729`	`726`	`};`
`730`	`727`
`731`	`728`	`#if PY3K`
Original file line number	Diff line number	Diff line change
`@@ -669,10 +669,7 @@ extern "C" {`
`669`	`669`
`670`	`670`	`struct module_state`
`671`	`671`	`{`
`672`		`- /* The Sun compiler can't handle empty structs */`
`673`		`-#if defined(__SUNPRO_C) \|\| defined(_MSC_VER)`
`674`	`672`	`int _dummy;`
`675`		`-#endif`
`676`	`673`	`};`
`677`	`674`
`678`	`675`	`#if PY3K`
Original file line number	Diff line number	Diff line change
`@@ -490,10 +490,7 @@ extern "C" {`
`490`	`490`
`491`	`491`	`struct module_state`
`492`	`492`	`{`
`493`		`- /* The Sun compiler can't handle empty structs */`
`494`		`-#if defined(__SUNPRO_C) \|\| defined(_MSC_VER)`
`495`	`493`	`int _dummy;`
`496`		`-#endif`
`497`	`494`	`};`
`498`	`495`
`499`	`496`	`#if PY3K`
Original file line number	Diff line number	Diff line change
`@@ -1618,10 +1618,7 @@ extern "C" {`
`1618`	`1618`
`1619`	`1619`	`struct module_state`
`1620`	`1620`	`{`
`1621`		`-/* The Sun compiler can't handle empty structs */`
`1622`		`-#if defined(__SUNPRO_C) \|\| defined(_MSC_VER)`
`1623`	`1621`	`int _dummy;`
`1624`		`-#endif`
`1625`	`1622`	`};`
`1626`	`1623`
`1627`	`1624`	`#if PY3K`
Original file line number	Diff line number	Diff line change
`@@ -493,13 +493,13 @@ int convert_offset_position(PyObject obj, void offsetp)`
`493`	`493`	`e_offset_position offset = (e_offset_position )offsetp;`
`494`	`494`	`const char *names[] = {"data", NULL};`
`495`	`495`	`int values[] = {OFFSET_POSITION_DATA};`
`496`		`- int result = OFFSET_POSITION_FIGURE;`
	`496`	`+ int result = (int)OFFSET_POSITION_FIGURE;`
`497`	`497`
`498`	`498`	`if (!convert_string_enum(obj, "offset_position", names, values, &result)) {`
`499`	`499`	`PyErr_Clear();`
`500`	`500`	`}`
`501`	`501`
`502`		`- *offset = result;`
	`502`	`+ *offset = (e_offset_position)result;`
`503`	`503`
`504`	`504`	`return 1;`
`505`	`505`	`}`