Define _LINUX_SOURCE_COMPAT for AIX build.

This takes care of the conflict between GTK+ headers and #define of func_data
in AIX sys/timer.h.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index dfac8729a64a312665d80781ea9624bfff0e4e12..39ba6aaf36bbb6f45f7b631d9b96afb3ab505701 100755 (executable)
--- a/configure
+++ b/configure
@@ -19583,8 +19583,12 @@ case "${host}" in
 esac
 
 
-if test "x$XLCXX" = "xyes" -a "x$USE_AIX" = "x1"; then
-    CXXFLAGS="-qunique $CXXFLAGS"
+if test "x$USE_AIX" = "x1"; then
+            if test "x$XLCXX" = "xyes"; then
+        CXXFLAGS="-qunique $CXXFLAGS"
+    fi
+
+                                CPPFLAGS="-D_LINUX_SOURCE_COMPAT $CPPFLAGS"
 fi
 
 case "${host}" in

diff --git a/configure.in b/configure.in
index 1125d1820aa7f05153f6b25ed91c9d898c6ba0be..11a430978d7a780635ffcf2d0584a28e47ce19a2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1384,10 +1384,21 @@ dnl ------------------------------------------------------------------------
 dnl Platform specific tests
 dnl ------------------------------------------------------------------------
 
-dnl xlC needs -qunique under AIX so that one source file can be
-dnl compiled to multiple object files and safely linked together.
-if test "x$XLCXX" = "xyes" -a "x$USE_AIX" = "x1"; then
-    CXXFLAGS="-qunique $CXXFLAGS"
+if test "x$USE_AIX" = "x1"; then
+    dnl xlC needs -qunique under AIX so that one source file can be
+    dnl compiled to multiple object files and safely linked together.
+    if test "x$XLCXX" = "xyes"; then
+        CXXFLAGS="-qunique $CXXFLAGS"
+    fi
+
+    dnl AIX sys/timer.h header #defines func_data as t_union.data breaking the
+    dnl compilation of GTK+ headers that use func_data as parameter name in
+    dnl several places. We could work around this by inserting "#undef
+    dnl func_data" in the code but IBM provides a possibility to disable this
+    dnl #define by pre-defining the symbol below and this seems to be simpler.
+    dnl And if we have any problems because of it we can always remove it and
+    dnl use the #undef approach.
+    CPPFLAGS="-D_LINUX_SOURCE_COMPAT $CPPFLAGS"
 fi
 
 dnl This case is for PowerPC OS X vs. everything else