Visualage fixes for Stefan's socket implementations

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

diff --git a/include/wx/os2/app.h b/include/wx/os2/app.h
index 66504eacbe2eb13e2aa6171879c27b0e02e5c8fb..f5287d284c27b74bd58918556fc8822f58fde27c 100644 (file)
--- a/include/wx/os2/app.h
+++ b/include/wx/os2/app.h
@@ -14,7 +14,16 @@
 
 #include <sys/time.h>
 #include <sys/types.h>
 
 #include <sys/time.h>
 #include <sys/types.h>

+
+#ifdef __EMX__

 #include <unistd.h>
 #include <unistd.h>

+#else
+#include <utils.h>
+#undef BYTE_ORDER
+#include <types.h>
+#include <nerrno.h>
+#define INCL_ORDERS
+#endif

 
 #include "wx/event.h"
 #include "wx/icon.h"
 
 #include "wx/event.h"
 #include "wx/icon.h"


@@ -95,11 +104,12 @@ protected:
     // PM-specific wxApp definitions */
     //
 private:
     // PM-specific wxApp definitions */
     //
 private:

-    int m_maxSocketHandles;
-    int m_maxSocketNr;
-    int m_lastUsedHandle;
-    fd_set m_readfds, m_writefds;
-    void *m_sockCallbackInfo;
+    int                             m_maxSocketHandles;
+    int                             m_maxSocketNr;
+    int                             m_lastUsedHandle;
+    fd_set                          m_readfds;
+    fd_set                          m_writefds;
+    void*                           m_sockCallbackInfo;

 
 public:
 
 
 public:
 

diff --git a/src/Wxwindll.icc b/src/Wxwindll.icc
index a80f4083578f5550e684a07187e5957ffe799c90..ffe527a53869f2db4038cf3252c5a36630816852 100644 (file)
--- a/src/Wxwindll.icc
+++ b/src/Wxwindll.icc
@@ -50,6 +50,7 @@ option ProjectOptions = lang(longlong, "yes"),  gen(manglelinkagekeywordonlyfunc
       source type(cpp) "COMMON\\DATSTRM.CPP"
       source type(cpp) "COMMON\\DCBASE.CPP"
       source type(cpp) "COMMON\\DLGCMN.CPP"
       source type(cpp) "COMMON\\DATSTRM.CPP"
       source type(cpp) "COMMON\\DCBASE.CPP"
       source type(cpp) "COMMON\\DLGCMN.CPP"

+      source type(cpp) "COMMON\\DIRCMN.CPP"

       source type(cpp) "COMMON\\DNDCMN.CPP"
       source type(cpp) "COMMON\\DOBJCMN.CPP"
       source type(cpp) "COMMON\\DOCMDI.CPP"
       source type(cpp) "COMMON\\DNDCMN.CPP"
       source type(cpp) "COMMON\\DOBJCMN.CPP"
       source type(cpp) "COMMON\\DOCMDI.CPP"


@@ -246,6 +247,10 @@ option ProjectOptions = lang(longlong, "yes"),  gen(manglelinkagekeywordonlyfunc
       {
          source "OS2\\GSOCKET.C"
       }
       {
          source "OS2\\GSOCKET.C"
       }

+      option report(level, "E")
+      {
+         source "OS2\\GSOCKPM.C"
+      }

       source type(cpp) "OS2\\HELPWIN.CPP"
       source type(cpp) "OS2\\ICON.CPP"
       source type(cpp) "OS2\\INICONF.CPP"
       source type(cpp) "OS2\\HELPWIN.CPP"
       source type(cpp) "OS2\\ICON.CPP"
       source type(cpp) "OS2\\INICONF.CPP"

diff --git a/src/makeva.env b/src/makeva.env
index b4dc4828fda8626a77c57f5e4824ed3c9ba8da19..eafd3a48a13334f365a9c66daac9448cfd5258db 100644 (file)
--- a/src/makeva.env
+++ b/src/makeva.env
@@ -118,14 +118,14 @@ WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib
 
 INC=-I$(WXINC) -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/xpm -I$(WXDIR)/src/tiff -I$(WXDIR)/src/png -I$(EXTRAINC)
 !if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
 
 INC=-I$(WXINC) -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/xpm -I$(WXDIR)/src/tiff -I$(WXDIR)/src/png -I$(EXTRAINC)
 !if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"

-LINKLIBS=CPPOM30I.LIB CPPOOC3I.LIB OS2386.LIB $(UPMLIB)\UPM32.LIB $(NETLIB)\NETAPI32.LIB $(TCPIP)\TCP32DLL.LIB $(TCPIP)\SO32DLL.LIB
+LINKLIBS=CPPOM30I.LIB CPPOOC3I.LIB OS2386.LIB $(UPMLIB)\UPM32.LIB $(NETLIB)\NETAPI32.LIB $(TCPIP)\TCP32DLL.LIB $(TCPIP)\SO32DLL.LIB $(TCPIP)\TCPIP32.LIB $(TCPIP)\R0LIB32.LIB

 EXTRALIBS=$(WXDIR)\lib\os2pngd.lib $(WXDIR)\lib\os2zlibd.lib $(WXDIR)\lib\os2jpegd.lib $(WXDIR)\lib\os2xpmd.lib $(WXDIR)\lib\os2tiffd.lib
 !if "$(WXUSINGDLL)" == "1"
 EXTRALIBS=$(EXTRALIBS) $(WXLIB)
 !endif
 LIBS=$(LINKLIBS) $(EXTRALIBS)
 !else
 EXTRALIBS=$(WXDIR)\lib\os2pngd.lib $(WXDIR)\lib\os2zlibd.lib $(WXDIR)\lib\os2jpegd.lib $(WXDIR)\lib\os2xpmd.lib $(WXDIR)\lib\os2tiffd.lib
 !if "$(WXUSINGDLL)" == "1"
 EXTRALIBS=$(EXTRALIBS) $(WXLIB)
 !endif
 LIBS=$(LINKLIBS) $(EXTRALIBS)
 !else

-LINKLIBS=CPPOM30.LIB CPPOOC3.LIB OS2386.LIB $(UPMLIB)\UPM32.LIB $(NETLIB)\NETAPI32.LIB $(TCPIP)\TCP32DLL.LIB $(TCPIP)\SO32DLL.LIB
+LINKLIBS=CPPOM30.LIB CPPOOC3.LIB OS2386.LIB $(UPMLIB)\UPM32.LIB $(NETLIB)\NETAPI32.LIB $(TCPIP)\TCP32DLL.LIB $(TCPIP)\SO32DLL.LIB $(TCPIP)\TCPIP32.LIB $(TCPIP)\R0LIB32.LIB

 EXTRALIBS=$(WXDIR)\lib\os2png.lib $(WXDIR)\lib\os2zlib.lib $(WXDIR)\lib\os2jpeg.lib $(WXDIR)\lib\os2xpm.lib $(WXDIR)\lib\os2tiff.lib
 LIBS=$(WXLIB) $(LINKLIBS) $(EXTRALIBS)
 !endif
 EXTRALIBS=$(WXDIR)\lib\os2png.lib $(WXDIR)\lib\os2zlib.lib $(WXDIR)\lib\os2jpeg.lib $(WXDIR)\lib\os2xpm.lib $(WXDIR)\lib\os2tiff.lib
 LIBS=$(WXLIB) $(LINKLIBS) $(EXTRALIBS)
 !endif

diff --git a/src/wxWin.icc b/src/wxWin.icc
index 54b9e4946c9b4efb6f8d30358caf1f181e322a91..30602a9d45814d93347d11f45b4ebc6f128a2c3b 100644 (file)
--- a/src/wxWin.icc
+++ b/src/wxWin.icc
@@ -34,6 +34,7 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
       source "COMMON\\db.cpp"
       source "COMMON\\dbtable.cpp"
       source "COMMON\\dcbase.cpp"
       source "COMMON\\db.cpp"
       source "COMMON\\dbtable.cpp"
       source "COMMON\\dcbase.cpp"

+      source "COMMON\\dircmn.cpp"

       source "COMMON\\dlgcmn.cpp"
       source "COMMON\\dndcmn.cpp"
       source "COMMON\\dobjcmn.cpp"
       source "COMMON\\dlgcmn.cpp"
       source "COMMON\\dndcmn.cpp"
       source "COMMON\\dobjcmn.cpp"


@@ -229,6 +230,10 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
       {
          source type("c") "OS2\\GSOCKET.C"
       }
       {
          source type("c") "OS2\\GSOCKET.C"
       }

+      option report(level, "E")
+      {
+         source type("c") "OS2\\GSOCKPM.C"
+      }

       source "OS2\\HELPWIN.CPP"
       source "OS2\\ICON.CPP"
       source "OS2\\INICONF.CPP"
       source "OS2\\HELPWIN.CPP"
       source "OS2\\ICON.CPP"
       source "OS2\\INICONF.CPP"