removed a condition (l. 124) that always eval to true

[wxWidgets.git] / src / os2 / gsocket.c

diff --git a/src/os2/gsocket.c b/src/os2/gsocket.c
index 4f53fa5fc06ab39f9c214ca24c0bd6b799bf612e..0ea14036b81d920ba78b201778abd4165fd95857 100644 (file)
--- a/src/os2/gsocket.c
+++ b/src/os2/gsocket.c
@@ -11,18 +11,31 @@
 
 #if wxUSE_SOCKETS
 
 
 #if wxUSE_SOCKETS
 

-#define BSD_SELECT // use Berkley Sockets select
+#define BSD_SELECT /* use Berkley Sockets select */

 
 #include <assert.h>
 
 #include <assert.h>

-#include <ioctl.h>

 #include <sys\types.h>
 #include <sys\types.h>

-#include <socket.h>

 #include <utils.h>
 #include <sys\time.h>
 #include <in.h>
 #include <netdb.h>
 #include <nerrno.h>
 #include <utils.h>
 #include <sys\time.h>
 #include <in.h>
 #include <netdb.h>
 #include <nerrno.h>

+#if defined(__VISAGECPP__) && __IBMCPP__ < 400
+#include <socket.h>
+#include <ioctl.h>

 #include <select.h>
 #include <select.h>

+#else
+#include <sys\socket.h>
+#include <sys\ioctl.h>
+#include <sys\select.h>
+#define select(a,b,c,d,e) bsdselect(a,b,c,d,e)
+int _System bsdselect(int,
+                      struct fd_set *,
+                      struct fd_set *,
+                      struct fd_set *,
+                      struct timeval *);
+int _System soclose(int);
+#endif

 
 #include <string.h>
 #include <stdio.h>
 
 #include <string.h>
 #include <stdio.h>