changes for compilation with MS VC++

git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/trunk@46 119443c7-1b9e-41f8-b6fc-b9c35fce742c
This commit is contained in:
Oxy 2006-07-07 06:58:19 +00:00
parent ebac5fe596
commit ab66940a89
4 changed files with 321 additions and 1 deletions

287
build/libupnp.dsp Normal file
View File

@ -0,0 +1,287 @@
# Microsoft Developer Studio Project File - Name="libupnp" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** NICHT BEARBEITEN **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=libupnp - Win32 Debug
!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
!MESSAGE
!MESSAGE NMAKE /f "libupnp.mak".
!MESSAGE
!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
!MESSAGE
!MESSAGE NMAKE /f "libupnp.mak" CFG="libupnp - Win32 Debug"
!MESSAGE
!MESSAGE Für die Konfiguration stehen zur Auswahl:
!MESSAGE
!MESSAGE "libupnp - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library")
!MESSAGE "libupnp - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "libupnp - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBUPNP_EXPORTS" /YX /FD /c
# ADD CPP /nologo /MT /W3 /GX /O2 /I "E:\svnupnp\trunk\libupnp\ixml\src\inc" /I "E:\svnupnp\trunk\libupnp\ixml\inc" /I "E:\svnupnp\trunk\libupnp\threadutil\inc" /I "E:\svnupnp\trunk\libupnp\upnp\inc" /I "E:\svnupnp\trunk\libupnp\upnp\src\inc" /I "E:\svnupnp\trunk\libupnp\build\inc" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBUPNP_EXPORTS" /FR /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x407 /d "NDEBUG"
# ADD RSC /l 0x407 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
# ADD LINK32 kernel32.lib user32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib E:\svnupnp\trunk\libupnp\build\bin\pthreadvc2.lib ws2_32.lib /nologo /dll /machine:I386
!ELSEIF "$(CFG)" == "libupnp - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBUPNP_EXPORTS" /YX /FD /GZ /c
# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "E:\svnupnp\trunk\libupnp\ixml\src\inc" /I "E:\svnupnp\trunk\libupnp\ixml\inc" /I "E:\svnupnp\trunk\libupnp\threadutil\inc" /I "E:\svnupnp\trunk\libupnp\upnp\inc" /I "E:\svnupnp\trunk\libupnp\upnp\src\inc" /I "E:\svnupnp\trunk\libupnp\build\inc" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBUPNP_EXPORTS" /FR /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x407 /d "_DEBUG"
# ADD RSC /l 0x407 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib E:\svnupnp\trunk\libupnp\build\bin\pthreadvc2.lib ws2_32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
!ENDIF
# Begin Target
# Name "libupnp - Win32 Release"
# Name "libupnp - Win32 Debug"
# Begin Group "Quellcodedateien"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=..\ixml\src\attr.c
# End Source File
# Begin Source File
SOURCE=..\upnp\src\genlib\client_table\client_table.c
# End Source File
# Begin Source File
SOURCE=..\ixml\src\document.c
# End Source File
# Begin Source File
SOURCE=..\ixml\src\element.c
# End Source File
# Begin Source File
SOURCE=..\threadutil\src\FreeList.c
# End Source File
# Begin Source File
SOURCE=..\upnp\src\gena\gena_callback2.c
# End Source File
# Begin Source File
SOURCE=..\upnp\src\gena\gena_ctrlpt.c
# End Source File
# Begin Source File
SOURCE=..\upnp\src\gena\gena_device.c
# End Source File
# Begin Source File
SOURCE=..\upnp\src\genlib\net\http\httpparser.c
# End Source File
# Begin Source File
SOURCE=..\upnp\src\genlib\net\http\httpreadwrite.c
# End Source File
# Begin Source File
SOURCE=..\threadutil\src\iasnprintf.c
# End Source File
# Begin Source File
SOURCE=..\upnp\src\inet_pton.c
# End Source File
# Begin Source File
SOURCE=..\ixml\src\ixml.c
# End Source File
# Begin Source File
SOURCE=..\ixml\src\ixmlmembuf.c
# End Source File
# Begin Source File
SOURCE=..\ixml\src\ixmlparser.c
# End Source File
# Begin Source File
SOURCE=..\threadutil\src\LinkedList.c
# End Source File
# Begin Source File
SOURCE=..\upnp\src\uuid\md5.c
# End Source File
# Begin Source File
SOURCE=..\upnp\src\genlib\util\membuffer.c
# End Source File
# Begin Source File
SOURCE=..\upnp\src\genlib\miniserver\miniserver.c
# End Source File
# Begin Source File
SOURCE=..\ixml\src\namedNodeMap.c
# End Source File
# Begin Source File
SOURCE=..\ixml\src\node.c
# End Source File
# Begin Source File
SOURCE=..\ixml\src\nodeList.c
# End Source File
# Begin Source File
SOURCE=..\upnp\src\genlib\net\http\parsetools.c
# End Source File
# Begin Source File
SOURCE=..\upnp\src\genlib\service_table\service_table.c
# End Source File
# Begin Source File
SOURCE=..\upnp\src\soap\soap_common.c
# End Source File
# Begin Source File
SOURCE=..\upnp\src\soap\soap_ctrlpt.c
# End Source File
# Begin Source File
SOURCE=..\upnp\src\soap\soap_device.c
# End Source File
# Begin Source File
SOURCE=..\upnp\src\genlib\net\sock.c
# End Source File
# Begin Source File
SOURCE=..\upnp\src\ssdp\ssdp_ctrlpt.c
# End Source File
# Begin Source File
SOURCE=..\upnp\src\ssdp\ssdp_device.c
# End Source File
# Begin Source File
SOURCE=..\upnp\src\ssdp\ssdp_server.c
# End Source File
# Begin Source File
SOURCE=..\upnp\src\genlib\net\http\statcodes.c
# End Source File
# Begin Source File
SOURCE=..\upnp\src\genlib\util\strintmap.c
# End Source File
# Begin Source File
SOURCE=..\upnp\src\uuid\sysdep.c
# End Source File
# Begin Source File
SOURCE=..\threadutil\src\ThreadPool.c
# End Source File
# Begin Source File
SOURCE=..\threadutil\src\TimerThread.c
# End Source File
# Begin Source File
SOURCE=..\upnp\src\genlib\util\upnp_timeout.c
# End Source File
# Begin Source File
SOURCE=..\upnp\src\api\upnpapi.c
# End Source File
# Begin Source File
SOURCE=..\upnp\src\api\upnptools.c
# End Source File
# Begin Source File
SOURCE=..\upnp\src\genlib\net\uri\uri.c
# End Source File
# Begin Source File
SOURCE=..\upnp\src\urlconfig\urlconfig.c
# End Source File
# Begin Source File
SOURCE=..\upnp\src\genlib\util\util.c
# End Source File
# Begin Source File
SOURCE=..\upnp\src\uuid\uuid.c
# End Source File
# Begin Source File
SOURCE=..\upnp\src\genlib\net\http\webserver.c
# End Source File
# Begin Source File
SOURCE=..\upnp\src\win_dll.c
# End Source File
# End Group
# Begin Group "Header-Dateien"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# End Group
# Begin Group "Ressourcendateien"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
# Begin Source File
SOURCE=..\..\..\..\libupnp_win32.patch
# End Source File
# End Target
# End Project

29
build/libupnp.dsw Normal file
View File

@ -0,0 +1,29 @@
Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNUNG: DIESE ARBEITSBEREICHSDATEI DARF NICHT BEARBEITET ODER GELÖSCHT WERDEN!
###############################################################################
Project: "libupnp"=.\libupnp.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Global:
Package=<5>
{{{
}}}
Package=<3>
{{{
}}}
###############################################################################

View File

@ -67,6 +67,10 @@ typedef enum priority {LOW_PRIORITY,
//Statistics
#ifdef WIN32 // todo: check why STATSONLY fails during compilation
#undef STATS
#endif
#ifdef STATS
#define STATSONLY(x) x
#else

View File

@ -73,7 +73,7 @@ inet_ntop4(const u_char *src, char *dst, socklen_t size)
}
tmp[i - 1] = '\0';
if (strlen(tmp)>size) {
if ((socklen_t)strlen(tmp)>size) {
//__set_errno (ENOSPC);
return (NULL);
}