diff options
| author | click <click@gonnamakeyou.com> | 2013-02-28 13:23:15 +0100 |
|---|---|---|
| committer | click <click@gonnamakeyou.com> | 2013-02-28 13:23:15 +0100 |
| commit | 523e732c03b0cbd49aa367f435c75891167e7823 (patch) | |
| tree | 70055e1c201b029ce3b164bef0e4a86b20f711a4 /dep | |
| parent | e097994b23f2ec500a5446c261b8a52f0ff294c9 (diff) | |
Core/Dep: G3D: Correction to patch G3D-v8.0_hotfix5.diff, add missing #ifdef -test (applied to sourcetree as well)
Diffstat (limited to 'dep')
| -rw-r--r-- | dep/g3dlite/G3D-v8.0_hotfix5.diff | 6 | ||||
| -rw-r--r-- | dep/g3dlite/include/G3D/System.h | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/dep/g3dlite/G3D-v8.0_hotfix5.diff b/dep/g3dlite/G3D-v8.0_hotfix5.diff index 29b7eba811b..fd02b329c4a 100644 --- a/dep/g3dlite/G3D-v8.0_hotfix5.diff +++ b/dep/g3dlite/G3D-v8.0_hotfix5.diff @@ -2,11 +2,13 @@ diff --git a/dep/g3dlite/include/G3D/System.h b/dep/g3dlite/include/G3D/System.h index 1c0cf99..f160774 100644 --- a/dep/g3dlite/include/G3D/System.h +++ b/dep/g3dlite/include/G3D/System.h -@@ -19,6 +19,7 @@ +@@ -19,6 +19,9 @@ #include "G3D/G3DGameUnits.h" #include "G3D/BinaryFormat.h" #include <string> -+#include <sys/socket.h> ++#ifdef G3D_LINUX ++# include <sys/socket.h> ++#endif #ifdef G3D_OSX # include <CoreServices/CoreServices.h> diff --git a/dep/g3dlite/include/G3D/System.h b/dep/g3dlite/include/G3D/System.h index f1607747bbe..45aef1549b6 100644 --- a/dep/g3dlite/include/G3D/System.h +++ b/dep/g3dlite/include/G3D/System.h @@ -19,7 +19,9 @@ #include "G3D/G3DGameUnits.h" #include "G3D/BinaryFormat.h" #include <string> -#include <sys/socket.h> +#ifdef G3D_LINUX +# include <sys/socket.h> +#endif #ifdef G3D_OSX # include <CoreServices/CoreServices.h> |