From Bob Kuehne, fixes for OSX 10.4 build.

2005-05-03 14:31:01 +00:00
parent 003329fd10
commit 2bb2d9bb37
7 changed files with 15 additions and 8 deletions
--- a/src/osgPlugins/net/sockinet.cpp
+++ b/src/osgPlugins/net/sockinet.cpp
@@ -34,7 +34,7 @@
 //  The constructors of isockinet, osockinet and iosockinet are changed.

 #include "sockinet.h"
-#if defined(__APPLE__) 
+#if defined( __APPLE__ ) && ( __GNUC__ < 4 )
 typedef int socklen_t;
 #endif

--- a/src/osgPlugins/net/sockstream.cpp
+++ b/src/osgPlugins/net/sockstream.cpp
@@ -64,7 +64,7 @@
 #include <sstream>
 #include <string>

-#if defined(__APPLE__) || defined(WIN32) || defined (__sgi) || defined (__hpux)
+#if (defined(__APPLE__)&&(__GNUC__<4)) || defined(WIN32) || defined (__sgi) || defined (__hpux) 
 typedef int socklen_t;
 #endif