Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Visualage fixes for Stefan's socket implementations

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2001-05-21 20:29:42 +00:00
parent c3302e7e29
commit 2910855229
4 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/wx/os2/app.h
View File

@@ -14,7 +14,16 @@
#include <sys/time.h> #include <sys/time.h>
#include <sys/types.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/event.h"
#include "wx/icon.h" #include "wx/icon.h"
@@ -95,11 +104,12 @@ protected:
// PM-specific wxApp definitions */ // PM-specific wxApp definitions */
// //
private: private:
int m_maxSocketHandles; int m_maxSocketHandles;
int m_maxSocketNr; int m_maxSocketNr;
int m_lastUsedHandle; int m_lastUsedHandle;
fd_set m_readfds, m_writefds; fd_set m_readfds;
void *m_sockCallbackInfo; fd_set m_writefds;
void* m_sockCallbackInfo;
public: public:

5
src/Wxwindll.icc
View File

@@ -50,6 +50,7 @@ option ProjectOptions = lang(longlong, "yes"), gen(manglelinkagekeywordonlyfunc
source type(cpp) "COMMON\\DATSTRM.CPP" source type(cpp) "COMMON\\DATSTRM.CPP"
source type(cpp) "COMMON\\DCBASE.CPP" source type(cpp) "COMMON\\DCBASE.CPP"
source type(cpp) "COMMON\\DLGCMN.CPP" source type(cpp) "COMMON\\DLGCMN.CPP"
source type(cpp) "COMMON\\DIRCMN.CPP"
source type(cpp) "COMMON\\DNDCMN.CPP" source type(cpp) "COMMON\\DNDCMN.CPP"
source type(cpp) "COMMON\\DOBJCMN.CPP" source type(cpp) "COMMON\\DOBJCMN.CPP"
source type(cpp) "COMMON\\DOCMDI.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\\HELPWIN.CPP"
source type(cpp) "OS2\\ICON.CPP" source type(cpp) "OS2\\ICON.CPP"
source type(cpp) "OS2\\INICONF.CPP" source type(cpp) "OS2\\INICONF.CPP"

4
src/makeva.env
View File

@@ -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) 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" !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 EXTRALIBS=$(WXDIR)\lib\os2pngd.lib $(WXDIR)\lib\os2zlibd.lib $(WXDIR)\lib\os2jpegd.lib $(WXDIR)\lib\os2xpmd.lib $(WXDIR)\lib\os2tiffd.lib
!if "$(WXUSINGDLL)" == "1" !if "$(WXUSINGDLL)" == "1"
EXTRALIBS=$(EXTRALIBS) $(WXLIB) EXTRALIBS=$(EXTRALIBS) $(WXLIB)
!endif !endif
LIBS=$(LINKLIBS) $(EXTRALIBS) LIBS=$(LINKLIBS) $(EXTRALIBS)
!else !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 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) LIBS=$(WXLIB) $(LINKLIBS) $(EXTRALIBS)
!endif !endif

5
src/wxWin.icc
View File

@@ -34,6 +34,7 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"), gen(mangl
source "COMMON\\db.cpp" source "COMMON\\db.cpp"
source "COMMON\\dbtable.cpp" source "COMMON\\dbtable.cpp"
source "COMMON\\dcbase.cpp" source "COMMON\\dcbase.cpp"
source "COMMON\\dircmn.cpp"
source "COMMON\\dlgcmn.cpp" source "COMMON\\dlgcmn.cpp"
source "COMMON\\dndcmn.cpp" source "COMMON\\dndcmn.cpp"
source "COMMON\\dobjcmn.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\\HELPWIN.CPP"
source "OS2\\ICON.CPP" source "OS2\\ICON.CPP"
source "OS2\\INICONF.CPP" source "OS2\\INICONF.CPP"