From: Stefan Neis <Stefan.Neis@t-online.de>
Date: Fri, 14 Jan 2000 22:30:03 +0000 (+0000)
Subject: SN: Added suitable includes for EMX (#ifdef'ed __EMX__),
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/610c985186f6de255e248062b54da5afa31a25e7

SN: Added suitable includes for EMX (#ifdef'ed __EMX__),
        removed include to wx/defs.h (seems to be unnecessary and
        gcc chokes on C files containing C++ features (such as 'class')


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/os2/gsocket.c b/src/os2/gsocket.c
index 0ea14036b8..dadf5ae886 100644
--- a/src/os2/gsocket.c
+++ b/src/os2/gsocket.c
@@ -7,7 +7,6 @@
  */
 
 #include "wx/setup.h"
-#include "wx/defs.h"
 
 #if wxUSE_SOCKETS
 
@@ -15,11 +14,20 @@
 
 #include <assert.h>
 #include <sys\types.h>
+#ifdef __EMX__
+#include <sys/time.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <errno.h>
+#define HAVE_INET_ADDR
+#else
 #include <utils.h>
 #include <sys\time.h>
 #include <in.h>
 #include <netdb.h>
 #include <nerrno.h>
+#endif
 #if defined(__VISAGECPP__) && __IBMCPP__ < 400
 #include <socket.h>
 #include <ioctl.h>
@@ -28,6 +36,7 @@
 #include <sys\socket.h>
 #include <sys\ioctl.h>
 #include <sys\select.h>
+#ifndef __EMX__
 #define select(a,b,c,d,e) bsdselect(a,b,c,d,e)
 int _System bsdselect(int,
                       struct fd_set *,
@@ -36,6 +45,7 @@ int _System bsdselect(int,
                       struct timeval *);
 int _System soclose(int);
 #endif
+#endif
 
 #include <string.h>
 #include <stdio.h>