From f528ba8937439aa96bcc21a02eaa87b2caea0c14 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Sat, 4 Aug 2007 10:30:04 +0000 Subject: [PATCH] From John Shue, "Recent changes to sockstream.cpp and sockinet.cpp to better deal with various operating system differences between socklen_t and int have broken the FreeBSD build. Change was to add __FreeBSD__ to the list of defines that are checked." --- src/osgPlugins/net/sockinet.cpp | 2 +- src/osgPlugins/net/sockstream.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osgPlugins/net/sockinet.cpp b/src/osgPlugins/net/sockinet.cpp index be92a092d..02b7ade1a 100644 --- a/src/osgPlugins/net/sockinet.cpp +++ b/src/osgPlugins/net/sockinet.cpp @@ -62,7 +62,7 @@ extern "C" { // Do not include anything below that define. That should in no case change any forward decls in // system headers ... #if (defined(__APPLE__)&&(__GNUC__<4)) || (defined(WIN32)&&!defined(__CYGWIN__)) || \ - (!defined(__APPLE__) && !defined(WIN32) && !defined(_XOPEN_SOURCE_EXTENDED)) + (!defined(__APPLE__) && !defined(WIN32) && !defined(_XOPEN_SOURCE_EXTENDED) && !defined(__FreeBSD__)) #define socklen_t int #endif diff --git a/src/osgPlugins/net/sockstream.cpp b/src/osgPlugins/net/sockstream.cpp index 5a10b4eb2..27886ced0 100644 --- a/src/osgPlugins/net/sockstream.cpp +++ b/src/osgPlugins/net/sockstream.cpp @@ -139,7 +139,7 @@ extern "C" { // Do not include anything below that define. That should in no case change any forward decls in // system headers ... #if (defined(__APPLE__)&&(__GNUC__<4)) || (defined(WIN32)&&!defined(__CYGWIN__)) || \ - (!defined(__APPLE__) && !defined(WIN32) && !defined(_XOPEN_SOURCE_EXTENDED)) + (!defined(__APPLE__) && !defined(WIN32) && !defined(_XOPEN_SOURCE_EXTENDED) && !defined(__FreeBSD__)) #define socklen_t int #endif