fix pointer conversion warnings on OSX 10.2

[wxWidgets.git] / src / unix / gsocket.cpp

diff --git a/src/unix/gsocket.cpp b/src/unix/gsocket.cpp
index 28e293681cdfe4351d3cfa94936ea7950275e36a..aeed5804a5a1ddbfdd19a24d989445e246cfb927 100644 (file)
--- a/src/unix/gsocket.cpp
+++ b/src/unix/gsocket.cpp
@@ -101,6 +101,9 @@ int _System soclose(int);
 #ifdef sgi
 #  include <bstring.h>
 #endif
+#ifdef _AIX
+#  include <strings.h>
+#endif
 #include <signal.h>
 
 #ifndef SOCKLEN_T
@@ -123,6 +126,16 @@ int _System soclose(int);
 #define SOCKOPTLEN_T SOCKLEN_T
 #endif
 
+/*
+ * OSX 10.2 has int args instead of SOCKLENXXX_T
+ */
+#if defined( __WXMAC__ ) && ( MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2 )
+#undef SOCKOPTLEN_T 
+#undef SOCKLEN_T
+#define SOCKOPTLEN_T int
+#define SOCKLEN_T int
+#endif
+
 /*
  * MSW defines this, Unices don't.
  */