From 523e732c03b0cbd49aa367f435c75891167e7823 Mon Sep 17 00:00:00 2001
From: click <click@gonnamakeyou.com>
Date: Thu, 28 Feb 2013 13:23:15 +0100
Subject: Core/Dep: G3D: Correction to patch G3D-v8.0_hotfix5.diff, add missing
 #ifdef -test (applied to sourcetree as well)

---
 dep/g3dlite/G3D-v8.0_hotfix5.diff | 6 ++++--
 dep/g3dlite/include/G3D/System.h  | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'dep')

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>
-- 
cgit v1.2.3