From be1047471ae4ca1bee1a22d97c0e46cef252c5a9 Mon Sep 17 00:00:00 2001
From: Jerome St-Louis <jerome@ecere.com>
Date: Sun, 31 Mar 2013 14:29:06 -0400
Subject: [PATCH] ecere: Improved C headers compatibility

---
 ecere/locale/ecere.pot              | 14 +++++++-------
 ecere/src/gui/GuiApplication.ec     |  1 +
 ecere/src/gui/drivers/XInterface.ec |  7 +++++--
 ecere/src/net/network.ec            |  1 +
 ecere/src/sys/DualPipe.c            |  1 +
 ecere/src/sys/Thread.ec             |  2 +-
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/ecere/locale/ecere.pot b/ecere/locale/ecere.pot
index 0e731a8..0357463 100644
--- a/ecere/locale/ecere.pot
+++ b/ecere/locale/ecere.pot
@@ -286,11 +286,11 @@ msgstr "Document"
 msgid "Down"
 msgstr "Down"
 
-#: ./src/gui/GuiApplication.ec:104
+#: ./src/gui/GuiApplication.ec:105
 msgid "Driver/Mode switch failed"
 msgstr "Driver/Mode switch failed"
 
-#: ./src/gui/GuiApplication.ec:200
+#: ./src/gui/GuiApplication.ec:201
 msgid "ECERE Application"
 msgstr "ECERE Application"
 
@@ -302,7 +302,7 @@ msgstr "Edit"
 msgid "Entire Computer"
 msgstr "Entire Computer"
 
-#: ./src/gui/GuiApplication.ec:1277
+#: ./src/gui/GuiApplication.ec:1278
 msgid "Error falling back to previous video mode.\n"
 msgstr "Error falling back to previous video mode.\n"
 
@@ -395,7 +395,7 @@ msgstr "Go To Line..."
 msgid "Go To...\tCtrl+G"
 msgstr "Go To...\tCtrl+G"
 
-#: ./src/gui/GuiApplication.ec:100
+#: ./src/gui/GuiApplication.ec:101
 msgid "Graphics driver not supported by any user interface system"
 msgstr "Graphics driver not supported by any user interface system"
 
@@ -540,7 +540,7 @@ msgid "No"
 msgstr "No"
 
 #: ./src/sys/System.ec:111
-#: ./src/gui/GuiApplication.ec:99
+#: ./src/gui/GuiApplication.ec:100
 msgid "No error"
 msgstr "No error"
 
@@ -853,11 +853,11 @@ msgstr "Whole word only"
 msgid "Window Style"
 msgstr "Window Style"
 
-#: ./src/gui/GuiApplication.ec:101
+#: ./src/gui/GuiApplication.ec:102
 msgid "Window creation failed"
 msgstr "Window creation failed"
 
-#: ./src/gui/GuiApplication.ec:102
+#: ./src/gui/GuiApplication.ec:103
 msgid "Window graphics loading failed"
 msgstr "Window graphics loading failed"
 
diff --git a/ecere/src/gui/GuiApplication.ec b/ecere/src/gui/GuiApplication.ec
index 6e85baf..adf6aff 100644
--- a/ecere/src/gui/GuiApplication.ec
+++ b/ecere/src/gui/GuiApplication.ec
@@ -47,6 +47,7 @@ default:
 #define set _set
 #include <sys/time.h>
 #include <unistd.h>
+#include <sys/select.h>
 
 #include <netinet/in.h>
 #include <netdb.h>
diff --git a/ecere/src/gui/drivers/XInterface.ec b/ecere/src/gui/drivers/XInterface.ec
index c3abbb6..291df9c 100644
--- a/ecere/src/gui/drivers/XInterface.ec
+++ b/ecere/src/gui/drivers/XInterface.ec
@@ -24,6 +24,7 @@ default:
 #include <malloc.h>
 #endif
 #include <unistd.h>
+#include <sys/select.h>
 
 //#include <stdio.h>
 //#include <stdlib.h>
@@ -43,8 +44,10 @@ default:
 #include <X11/Xutil.h>
 #include <X11/XKBlib.h>
 #include <X11/keysym.h>
-#include <sys/fcntl.h>
+#include <fcntl.h>
+#if !defined(ECERE_NO3D)
 #include <GL/glx.h>
+#endif
 #include <X11/extensions/Xrender.h>
 #include <X11/extensions/XShm.h>
 
@@ -958,7 +961,7 @@ default:
 
 #include <sys/ipc.h>
 #include <sys/shm.h>
-#include <sys/signal.h>
+#include <signal.h>
 #include <locale.h>
 
 
diff --git a/ecere/src/net/network.ec b/ecere/src/net/network.ec
index 2cb1354..d8afc90 100644
--- a/ecere/src/net/network.ec
+++ b/ecere/src/net/network.ec
@@ -19,6 +19,7 @@ default:
 
 #include <netinet/in.h>
 #include <netdb.h>
+#include <sys/select.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
 #include <sys/types.h>
diff --git a/ecere/src/sys/DualPipe.c b/ecere/src/sys/DualPipe.c
index 0c7469c..3d4c6a0 100644
--- a/ecere/src/sys/DualPipe.c
+++ b/ecere/src/sys/DualPipe.c
@@ -3,6 +3,7 @@
 #define UNICODE
 #include <windows.h>
 #else
+#include <sys/select.h>
 #include <signal.h>
 #include <unistd.h>
 #include <sys/wait.h>
diff --git a/ecere/src/sys/Thread.ec b/ecere/src/sys/Thread.ec
index 3737214..fac2a25 100644
--- a/ecere/src/sys/Thread.ec
+++ b/ecere/src/sys/Thread.ec
@@ -13,7 +13,7 @@ namespace sys;
 #else
 #include <pthread.h>
 #ifndef __ANDROID__
-#include <sys/signal.h>
+#include <signal.h>
 #endif
 #endif
 #undef uint
-- 
1.8.3.1