mirror of https://git.wownero.com/dsc/mxe.git
package gsoap: restored clobbered CRs in patch
This commit is contained in:
Mark Brand
parent
df37166bee
commit
d4c14f3060
|
|
@ -1,29 +1,29 @@
|
||||||
This file is part of mingw-cross-env.
|
This file is part of mingw-cross-env.
|
||||||
See doc/index.html for further information.
|
See doc/index.html for further information.
|
||||||
|
|
||||||
This patch has been taken from:
|
This patch has been taken from:
|
||||||
http://sourceforge.net/tracker/?func=detail&aid=3071779&group_id=52781&atid=468023
|
http://sourceforge.net/tracker/?func=detail&aid=3071779&group_id=52781&atid=468023
|
||||||
|
|
||||||
diff -urN a/gsoap/doc/soapdoc2.html b/gsoap/doc/soapdoc2.html
|
diff -urN a/gsoap/doc/soapdoc2.html b/gsoap/doc/soapdoc2.html
|
||||||
--- a/gsoap/doc/soapdoc2.html 2010-09-19 01:19:28.000000000 +0200
|
--- a/gsoap/doc/soapdoc2.html 2010-09-19 01:19:28.000000000 +0200
|
||||||
+++ b/gsoap/doc/soapdoc2.html 2010-09-20 11:19:02.306175307 +0200
|
+++ b/gsoap/doc/soapdoc2.html 2010-09-20 11:19:02.306175307 +0200
|
||||||
@@ -2599,10 +2599,10 @@
|
@@ -2599,10 +2599,10 @@
|
||||||
<div class="p"><!----></div>
|
<div class="p"><!----></div>
|
||||||
|
|
||||||
<ul>
|
<ul>
|
||||||
-<li> Win32 builds need winsock.dll (MS Visual C++ "wsock32.lib")
|
-<li> Win32 builds need winsock.dll (MS Visual C++ "wsock32.lib")
|
||||||
+<li> Win32 builds need winsock.dll (MS Visual C++ "ws2_32.lib")
|
+<li> Win32 builds need winsock.dll (MS Visual C++ "ws2_32.lib")
|
||||||
To do this in Visual C++ 6.0, go to "Project", "settings", select the "Link"
|
To do this in Visual C++ 6.0, go to "Project", "settings", select the "Link"
|
||||||
tab (the project file needs to be selected in the file view) and add
|
tab (the project file needs to be selected in the file view) and add
|
||||||
-"<i>wsock32.lib</i>" to the "<i>Object/library modules</i>" entry.<br /><br /></li>
|
-"<i>wsock32.lib</i>" to the "<i>Object/library modules</i>" entry.<br /><br /></li>
|
||||||
+"<i>ws2_32.lib</i>" to the "<i>Object/library modules</i>" entry.<br /><br /></li>
|
+"<i>ws2_32.lib</i>" to the "<i>Object/library modules</i>" entry.<br /><br /></li>
|
||||||
|
|
||||||
<li> Use files with extension .cpp only (don't mix .c with .cpp).<br /><br /></li>
|
<li> Use files with extension .cpp only (don't mix .c with .cpp).<br /><br /></li>
|
||||||
|
|
||||||
diff -urN a/gsoap/mod_gsoap/gsoap_win/isapi/samples/calc/winstuff.cpp b/gsoap/mod_gsoap/gsoap_win/isapi/samples/calc/winstuff.cpp
|
diff -urN a/gsoap/mod_gsoap/gsoap_win/isapi/samples/calc/winstuff.cpp b/gsoap/mod_gsoap/gsoap_win/isapi/samples/calc/winstuff.cpp
|
||||||
--- a/gsoap/mod_gsoap/gsoap_win/isapi/samples/calc/winstuff.cpp 2010-09-19 01:19:36.000000000 +0200
|
--- a/gsoap/mod_gsoap/gsoap_win/isapi/samples/calc/winstuff.cpp 2010-09-19 01:19:36.000000000 +0200
|
||||||
+++ b/gsoap/mod_gsoap/gsoap_win/isapi/samples/calc/winstuff.cpp 2010-09-20 11:18:57.285678758 +0200
|
+++ b/gsoap/mod_gsoap/gsoap_win/isapi/samples/calc/winstuff.cpp 2010-09-20 11:18:57.285678758 +0200
|
||||||
@@ -6,7 +6,7 @@
|
@@ -6,7 +6,7 @@
|
||||||
#include <winsock2.h>
|
#include <winsock2.h>
|
||||||
|
|
||||||
#if _MSC_VER > 1000
|
#if _MSC_VER > 1000
|
||||||
|
|
@ -32,10 +32,10 @@ diff -urN a/gsoap/mod_gsoap/gsoap_win/isapi/samples/calc/winstuff.cpp b/gsoap/mo
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static struct WSAInit { \
|
static struct WSAInit { \
|
||||||
diff -urN a/gsoap/mod_gsoap/gsoap_win/isapi/samples/dime/winstuff.cpp b/gsoap/mod_gsoap/gsoap_win/isapi/samples/dime/winstuff.cpp
|
diff -urN a/gsoap/mod_gsoap/gsoap_win/isapi/samples/dime/winstuff.cpp b/gsoap/mod_gsoap/gsoap_win/isapi/samples/dime/winstuff.cpp
|
||||||
--- a/gsoap/mod_gsoap/gsoap_win/isapi/samples/dime/winstuff.cpp 2010-09-19 01:19:36.000000000 +0200
|
--- a/gsoap/mod_gsoap/gsoap_win/isapi/samples/dime/winstuff.cpp 2010-09-19 01:19:36.000000000 +0200
|
||||||
+++ b/gsoap/mod_gsoap/gsoap_win/isapi/samples/dime/winstuff.cpp 2010-09-20 11:18:57.281678556 +0200
|
+++ b/gsoap/mod_gsoap/gsoap_win/isapi/samples/dime/winstuff.cpp 2010-09-20 11:18:57.281678556 +0200
|
||||||
@@ -8,7 +8,7 @@
|
@@ -8,7 +8,7 @@
|
||||||
|
|
||||||
|
|
||||||
#if _MSC_VER > 1000
|
#if _MSC_VER > 1000
|
||||||
|
|
@ -44,146 +44,146 @@ diff -urN a/gsoap/mod_gsoap/gsoap_win/isapi/samples/dime/winstuff.cpp b/gsoap/mo
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static struct WSAInit { \
|
static struct WSAInit { \
|
||||||
diff -urN a/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp b/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp
|
diff -urN a/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp b/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp
|
||||||
--- a/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp 2010-09-19 01:19:57.000000000 +0200
|
--- a/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp 2010-09-19 01:19:57.000000000 +0200
|
||||||
+++ b/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp 2010-09-20 11:18:57.769678579 +0200
|
+++ b/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp 2010-09-20 11:18:57.769678579 +0200
|
||||||
@@ -52,10 +52,10 @@
|
@@ -52,10 +52,10 @@
|
||||||
|
|
||||||
Installation note:
|
Installation note:
|
||||||
|
|
||||||
-Win32 build needs winsock.dll (Visual C++ "wsock32.lib")
|
-Win32 build needs winsock.dll (Visual C++ "wsock32.lib")
|
||||||
+Win32 build needs winsock.dll (Visual C++ "ws2_32.lib")
|
+Win32 build needs winsock.dll (Visual C++ "ws2_32.lib")
|
||||||
To do this in Visual C++ 6.0, go to "Project", "settings", select the "Link"
|
To do this in Visual C++ 6.0, go to "Project", "settings", select the "Link"
|
||||||
tab (the project file needs to be selected in the file view) and add
|
tab (the project file needs to be selected in the file view) and add
|
||||||
-"wsock32.lib" to the "Object/library modules" entry
|
-"wsock32.lib" to the "Object/library modules" entry
|
||||||
+"ws2_32.lib" to the "Object/library modules" entry
|
+"ws2_32.lib" to the "Object/library modules" entry
|
||||||
|
|
||||||
On Mac OS X with gcc (GCC) 3.1 20020420 (prerelease) you MUST compile with
|
On Mac OS X with gcc (GCC) 3.1 20020420 (prerelease) you MUST compile with
|
||||||
-fstack_check when using -O2 because gcc 3.1 has a bug that smashes the stack
|
-fstack_check when using -O2 because gcc 3.1 has a bug that smashes the stack
|
||||||
@@ -76,7 +76,7 @@
|
@@ -76,7 +76,7 @@
|
||||||
# ifdef UNDER_CE
|
# ifdef UNDER_CE
|
||||||
# pragma comment(lib, "winsock.lib")
|
# pragma comment(lib, "winsock.lib")
|
||||||
# else
|
# else
|
||||||
-# pragma comment(lib, "wsock32.lib")
|
-# pragma comment(lib, "wsock32.lib")
|
||||||
+# pragma comment(lib, "ws2_32.lib")
|
+# pragma comment(lib, "ws2_32.lib")
|
||||||
# endif
|
# endif
|
||||||
# pragma warning(disable : 4996) /* disable deprecation warnings */
|
# pragma warning(disable : 4996) /* disable deprecation warnings */
|
||||||
# endif
|
# endif
|
||||||
diff -urN a/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.h b/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.h
|
diff -urN a/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.h b/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.h
|
||||||
--- a/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.h 2010-09-19 01:19:57.000000000 +0200
|
--- a/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.h 2010-09-19 01:19:57.000000000 +0200
|
||||||
+++ b/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.h 2010-09-20 11:18:57.790175332 +0200
|
+++ b/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.h 2010-09-20 11:18:57.790175332 +0200
|
||||||
@@ -665,7 +665,7 @@
|
@@ -665,7 +665,7 @@
|
||||||
# define SOAP_GAI_STRERROR gai_strerrorA
|
# define SOAP_GAI_STRERROR gai_strerrorA
|
||||||
# else
|
# else
|
||||||
# ifndef __BORLANDC__
|
# ifndef __BORLANDC__
|
||||||
-# include <winsock.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */
|
-# include <winsock.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */
|
||||||
+# include <winsock2.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */
|
+# include <winsock2.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */
|
||||||
/* # include <winsock2.h> */ /* Alternative: use winsock2 (not available with eVC), enable this line and comment out the line above */
|
/* # include <winsock2.h> */ /* Alternative: use winsock2 (not available with eVC), enable this line and comment out the line above */
|
||||||
# else
|
# else
|
||||||
# include <winsock2.h> /* Borland C */
|
# include <winsock2.h> /* Borland C */
|
||||||
diff -urN a/gsoap/samples/wsse/stdsoap2.c b/gsoap/samples/wsse/stdsoap2.c
|
diff -urN a/gsoap/samples/wsse/stdsoap2.c b/gsoap/samples/wsse/stdsoap2.c
|
||||||
--- a/gsoap/samples/wsse/stdsoap2.c 2010-09-19 01:20:10.000000000 +0200
|
--- a/gsoap/samples/wsse/stdsoap2.c 2010-09-19 01:20:10.000000000 +0200
|
||||||
+++ b/gsoap/samples/wsse/stdsoap2.c 2010-09-20 11:18:57.846175378 +0200
|
+++ b/gsoap/samples/wsse/stdsoap2.c 2010-09-20 11:18:57.846175378 +0200
|
||||||
@@ -52,10 +52,10 @@
|
@@ -52,10 +52,10 @@
|
||||||
|
|
||||||
Installation note:
|
Installation note:
|
||||||
|
|
||||||
-Win32 build needs winsock.dll (Visual C++ "wsock32.lib")
|
-Win32 build needs winsock.dll (Visual C++ "wsock32.lib")
|
||||||
+Win32 build needs winsock.dll (Visual C++ "ws2_32.lib")
|
+Win32 build needs winsock.dll (Visual C++ "ws2_32.lib")
|
||||||
To do this in Visual C++ 6.0, go to "Project", "settings", select the "Link"
|
To do this in Visual C++ 6.0, go to "Project", "settings", select the "Link"
|
||||||
tab (the project file needs to be selected in the file view) and add
|
tab (the project file needs to be selected in the file view) and add
|
||||||
-"wsock32.lib" to the "Object/library modules" entry
|
-"wsock32.lib" to the "Object/library modules" entry
|
||||||
+"ws2_32.lib" to the "Object/library modules" entry
|
+"ws2_32.lib" to the "Object/library modules" entry
|
||||||
|
|
||||||
On Mac OS X with gcc (GCC) 3.1 20020420 (prerelease) you MUST compile with
|
On Mac OS X with gcc (GCC) 3.1 20020420 (prerelease) you MUST compile with
|
||||||
-fstack_check when using -O2 because gcc 3.1 has a bug that smashes the stack
|
-fstack_check when using -O2 because gcc 3.1 has a bug that smashes the stack
|
||||||
@@ -76,7 +76,7 @@
|
@@ -76,7 +76,7 @@
|
||||||
# ifdef UNDER_CE
|
# ifdef UNDER_CE
|
||||||
# pragma comment(lib, "winsock.lib")
|
# pragma comment(lib, "winsock.lib")
|
||||||
# else
|
# else
|
||||||
-# pragma comment(lib, "wsock32.lib")
|
-# pragma comment(lib, "wsock32.lib")
|
||||||
+# pragma comment(lib, "ws2_32.lib")
|
+# pragma comment(lib, "ws2_32.lib")
|
||||||
# endif
|
# endif
|
||||||
# pragma warning(disable : 4996) /* disable deprecation warnings */
|
# pragma warning(disable : 4996) /* disable deprecation warnings */
|
||||||
# endif
|
# endif
|
||||||
diff -urN a/gsoap/samples/wsse/stdsoap2.h b/gsoap/samples/wsse/stdsoap2.h
|
diff -urN a/gsoap/samples/wsse/stdsoap2.h b/gsoap/samples/wsse/stdsoap2.h
|
||||||
--- a/gsoap/samples/wsse/stdsoap2.h 2010-09-19 01:20:10.000000000 +0200
|
--- a/gsoap/samples/wsse/stdsoap2.h 2010-09-19 01:20:10.000000000 +0200
|
||||||
+++ b/gsoap/samples/wsse/stdsoap2.h 2010-09-20 11:18:57.874175123 +0200
|
+++ b/gsoap/samples/wsse/stdsoap2.h 2010-09-20 11:18:57.874175123 +0200
|
||||||
@@ -665,7 +665,7 @@
|
@@ -665,7 +665,7 @@
|
||||||
# define SOAP_GAI_STRERROR gai_strerrorA
|
# define SOAP_GAI_STRERROR gai_strerrorA
|
||||||
# else
|
# else
|
||||||
# ifndef __BORLANDC__
|
# ifndef __BORLANDC__
|
||||||
-# include <winsock.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */
|
-# include <winsock.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */
|
||||||
+# include <winsock2.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */
|
+# include <winsock2.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */
|
||||||
/* # include <winsock2.h> */ /* Alternative: use winsock2 (not available with eVC), enable this line and comment out the line above */
|
/* # include <winsock2.h> */ /* Alternative: use winsock2 (not available with eVC), enable this line and comment out the line above */
|
||||||
# else
|
# else
|
||||||
# include <winsock2.h> /* Borland C */
|
# include <winsock2.h> /* Borland C */
|
||||||
diff -urN a/gsoap/stdsoap2.c b/gsoap/stdsoap2.c
|
diff -urN a/gsoap/stdsoap2.c b/gsoap/stdsoap2.c
|
||||||
--- a/gsoap/stdsoap2.c 2010-09-19 01:20:12.000000000 +0200
|
--- a/gsoap/stdsoap2.c 2010-09-19 01:20:12.000000000 +0200
|
||||||
+++ b/gsoap/stdsoap2.c 2010-09-20 11:18:57.117678339 +0200
|
+++ b/gsoap/stdsoap2.c 2010-09-20 11:18:57.117678339 +0200
|
||||||
@@ -52,10 +52,10 @@
|
@@ -52,10 +52,10 @@
|
||||||
|
|
||||||
Installation note:
|
Installation note:
|
||||||
|
|
||||||
-Win32 build needs winsock.dll (Visual C++ "wsock32.lib")
|
-Win32 build needs winsock.dll (Visual C++ "wsock32.lib")
|
||||||
+Win32 build needs winsock.dll (Visual C++ "ws2_32.lib")
|
+Win32 build needs winsock.dll (Visual C++ "ws2_32.lib")
|
||||||
To do this in Visual C++ 6.0, go to "Project", "settings", select the "Link"
|
To do this in Visual C++ 6.0, go to "Project", "settings", select the "Link"
|
||||||
tab (the project file needs to be selected in the file view) and add
|
tab (the project file needs to be selected in the file view) and add
|
||||||
-"wsock32.lib" to the "Object/library modules" entry
|
-"wsock32.lib" to the "Object/library modules" entry
|
||||||
+"ws2_32.lib" to the "Object/library modules" entry
|
+"ws2_32.lib" to the "Object/library modules" entry
|
||||||
|
|
||||||
On Mac OS X with gcc (GCC) 3.1 20020420 (prerelease) you MUST compile with
|
On Mac OS X with gcc (GCC) 3.1 20020420 (prerelease) you MUST compile with
|
||||||
-fstack_check when using -O2 because gcc 3.1 has a bug that smashes the stack
|
-fstack_check when using -O2 because gcc 3.1 has a bug that smashes the stack
|
||||||
@@ -76,7 +76,7 @@
|
@@ -76,7 +76,7 @@
|
||||||
# ifdef UNDER_CE
|
# ifdef UNDER_CE
|
||||||
# pragma comment(lib, "winsock.lib")
|
# pragma comment(lib, "winsock.lib")
|
||||||
# else
|
# else
|
||||||
-# pragma comment(lib, "wsock32.lib")
|
-# pragma comment(lib, "wsock32.lib")
|
||||||
+# pragma comment(lib, "ws2_32.lib")
|
+# pragma comment(lib, "ws2_32.lib")
|
||||||
# endif
|
# endif
|
||||||
# pragma warning(disable : 4996) /* disable deprecation warnings */
|
# pragma warning(disable : 4996) /* disable deprecation warnings */
|
||||||
# endif
|
# endif
|
||||||
diff -urN a/gsoap/stdsoap2.cpp b/gsoap/stdsoap2.cpp
|
diff -urN a/gsoap/stdsoap2.cpp b/gsoap/stdsoap2.cpp
|
||||||
--- a/gsoap/stdsoap2.cpp 2010-09-19 01:20:12.000000000 +0200
|
--- a/gsoap/stdsoap2.cpp 2010-09-19 01:20:12.000000000 +0200
|
||||||
+++ b/gsoap/stdsoap2.cpp 2010-09-20 11:18:57.005678597 +0200
|
+++ b/gsoap/stdsoap2.cpp 2010-09-20 11:18:57.005678597 +0200
|
||||||
@@ -52,10 +52,10 @@
|
@@ -52,10 +52,10 @@
|
||||||
|
|
||||||
Installation note:
|
Installation note:
|
||||||
|
|
||||||
-Win32 build needs winsock.dll (Visual C++ "wsock32.lib")
|
-Win32 build needs winsock.dll (Visual C++ "wsock32.lib")
|
||||||
+Win32 build needs winsock.dll (Visual C++ "ws2_32.lib")
|
+Win32 build needs winsock.dll (Visual C++ "ws2_32.lib")
|
||||||
To do this in Visual C++ 6.0, go to "Project", "settings", select the "Link"
|
To do this in Visual C++ 6.0, go to "Project", "settings", select the "Link"
|
||||||
tab (the project file needs to be selected in the file view) and add
|
tab (the project file needs to be selected in the file view) and add
|
||||||
-"wsock32.lib" to the "Object/library modules" entry
|
-"wsock32.lib" to the "Object/library modules" entry
|
||||||
+"ws2_32.lib" to the "Object/library modules" entry
|
+"ws2_32.lib" to the "Object/library modules" entry
|
||||||
|
|
||||||
On Mac OS X with gcc (GCC) 3.1 20020420 (prerelease) you MUST compile with
|
On Mac OS X with gcc (GCC) 3.1 20020420 (prerelease) you MUST compile with
|
||||||
-fstack_check when using -O2 because gcc 3.1 has a bug that smashes the stack
|
-fstack_check when using -O2 because gcc 3.1 has a bug that smashes the stack
|
||||||
@@ -76,7 +76,7 @@
|
@@ -76,7 +76,7 @@
|
||||||
# ifdef UNDER_CE
|
# ifdef UNDER_CE
|
||||||
# pragma comment(lib, "winsock.lib")
|
# pragma comment(lib, "winsock.lib")
|
||||||
# else
|
# else
|
||||||
-# pragma comment(lib, "wsock32.lib")
|
-# pragma comment(lib, "wsock32.lib")
|
||||||
+# pragma comment(lib, "ws2_32.lib")
|
+# pragma comment(lib, "ws2_32.lib")
|
||||||
# endif
|
# endif
|
||||||
# pragma warning(disable : 4996) /* disable deprecation warnings */
|
# pragma warning(disable : 4996) /* disable deprecation warnings */
|
||||||
# endif
|
# endif
|
||||||
diff -urN a/gsoap/stdsoap2.h b/gsoap/stdsoap2.h
|
diff -urN a/gsoap/stdsoap2.h b/gsoap/stdsoap2.h
|
||||||
--- a/gsoap/stdsoap2.h 2010-09-19 01:20:12.000000000 +0200
|
--- a/gsoap/stdsoap2.h 2010-09-19 01:20:12.000000000 +0200
|
||||||
+++ b/gsoap/stdsoap2.h 2010-09-20 11:19:00.978175369 +0200
|
+++ b/gsoap/stdsoap2.h 2010-09-20 11:19:00.978175369 +0200
|
||||||
@@ -665,7 +665,7 @@
|
@@ -665,7 +665,7 @@
|
||||||
# define SOAP_GAI_STRERROR gai_strerrorA
|
# define SOAP_GAI_STRERROR gai_strerrorA
|
||||||
# else
|
# else
|
||||||
# ifndef __BORLANDC__
|
# ifndef __BORLANDC__
|
||||||
-# include <winsock.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */
|
-# include <winsock.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */
|
||||||
+# include <winsock2.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */
|
+# include <winsock2.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */
|
||||||
/* # include <winsock2.h> */ /* Alternative: use winsock2 (not available with eVC), enable this line and comment out the line above */
|
/* # include <winsock2.h> */ /* Alternative: use winsock2 (not available with eVC), enable this line and comment out the line above */
|
||||||
# else
|
# else
|
||||||
# include <winsock2.h> /* Borland C */
|
# include <winsock2.h> /* Borland C */
|
||||||
diff -urN a/gsoap/VisualStudio2005/README.txt b/gsoap/VisualStudio2005/README.txt
|
diff -urN a/gsoap/VisualStudio2005/README.txt b/gsoap/VisualStudio2005/README.txt
|
||||||
--- a/gsoap/VisualStudio2005/README.txt 2010-09-19 01:20:13.000000000 +0200
|
--- a/gsoap/VisualStudio2005/README.txt 2010-09-19 01:20:13.000000000 +0200
|
||||||
+++ b/gsoap/VisualStudio2005/README.txt 2010-09-20 11:18:57.302175378 +0200
|
+++ b/gsoap/VisualStudio2005/README.txt 2010-09-20 11:18:57.302175378 +0200
|
||||||
@@ -1,7 +1,7 @@
|
@@ -1,7 +1,7 @@
|
||||||
|
|
||||||
Visual Studio 2005 Solution files for soapcpp2 and wsdl2h.
|
Visual Studio 2005 Solution files for soapcpp2 and wsdl2h.
|
||||||
|
|
||||||
|
|
@ -192,47 +192,47 @@ diff -urN a/gsoap/VisualStudio2005/README.txt b/gsoap/VisualStudio2005/README.tx
|
||||||
|
|
||||||
To build soapcpp2, first install Bison and Flex (in the default dirs):
|
To build soapcpp2, first install Bison and Flex (in the default dirs):
|
||||||
http://gnuwin32.sourceforge.net/packages/bison.htm
|
http://gnuwin32.sourceforge.net/packages/bison.htm
|
||||||
diff -urN a/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp b/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp
|
diff -urN a/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp b/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp
|
||||||
--- a/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp 2010-09-19 01:20:14.000000000 +0200
|
--- a/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp 2010-09-19 01:20:14.000000000 +0200
|
||||||
+++ b/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp 2010-09-20 11:18:57.389678446 +0200
|
+++ b/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp 2010-09-20 11:18:57.389678446 +0200
|
||||||
@@ -52,10 +52,10 @@
|
@@ -52,10 +52,10 @@
|
||||||
|
|
||||||
Installation note:
|
Installation note:
|
||||||
|
|
||||||
-Win32 build needs winsock.dll (Visual C++ "wsock32.lib")
|
-Win32 build needs winsock.dll (Visual C++ "wsock32.lib")
|
||||||
+Win32 build needs winsock.dll (Visual C++ "ws2_32.lib")
|
+Win32 build needs winsock.dll (Visual C++ "ws2_32.lib")
|
||||||
To do this in Visual C++ 6.0, go to "Project", "settings", select the "Link"
|
To do this in Visual C++ 6.0, go to "Project", "settings", select the "Link"
|
||||||
tab (the project file needs to be selected in the file view) and add
|
tab (the project file needs to be selected in the file view) and add
|
||||||
-"wsock32.lib" to the "Object/library modules" entry
|
-"wsock32.lib" to the "Object/library modules" entry
|
||||||
+"ws2_32.lib" to the "Object/library modules" entry
|
+"ws2_32.lib" to the "Object/library modules" entry
|
||||||
|
|
||||||
On Mac OS X with gcc (GCC) 3.1 20020420 (prerelease) you MUST compile with
|
On Mac OS X with gcc (GCC) 3.1 20020420 (prerelease) you MUST compile with
|
||||||
-fstack_check when using -O2 because gcc 3.1 has a bug that smashes the stack
|
-fstack_check when using -O2 because gcc 3.1 has a bug that smashes the stack
|
||||||
@@ -76,7 +76,7 @@
|
@@ -76,7 +76,7 @@
|
||||||
# ifdef UNDER_CE
|
# ifdef UNDER_CE
|
||||||
# pragma comment(lib, "winsock.lib")
|
# pragma comment(lib, "winsock.lib")
|
||||||
# else
|
# else
|
||||||
-# pragma comment(lib, "wsock32.lib")
|
-# pragma comment(lib, "wsock32.lib")
|
||||||
+# pragma comment(lib, "ws2_32.lib")
|
+# pragma comment(lib, "ws2_32.lib")
|
||||||
# endif
|
# endif
|
||||||
# pragma warning(disable : 4996) /* disable deprecation warnings */
|
# pragma warning(disable : 4996) /* disable deprecation warnings */
|
||||||
# endif
|
# endif
|
||||||
diff -urN a/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.h b/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.h
|
diff -urN a/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.h b/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.h
|
||||||
--- a/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.h 2010-09-19 01:20:14.000000000 +0200
|
--- a/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.h 2010-09-19 01:20:14.000000000 +0200
|
||||||
+++ b/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.h 2010-09-20 11:18:57.537678408 +0200
|
+++ b/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.h 2010-09-20 11:18:57.537678408 +0200
|
||||||
@@ -665,7 +665,7 @@
|
@@ -665,7 +665,7 @@
|
||||||
# define SOAP_GAI_STRERROR gai_strerrorA
|
# define SOAP_GAI_STRERROR gai_strerrorA
|
||||||
# else
|
# else
|
||||||
# ifndef __BORLANDC__
|
# ifndef __BORLANDC__
|
||||||
-# include <winsock.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */
|
-# include <winsock.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */
|
||||||
+# include <winsock2.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */
|
+# include <winsock2.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */
|
||||||
/* # include <winsock2.h> */ /* Alternative: use winsock2 (not available with eVC), enable this line and comment out the line above */
|
/* # include <winsock2.h> */ /* Alternative: use winsock2 (not available with eVC), enable this line and comment out the line above */
|
||||||
# else
|
# else
|
||||||
# include <winsock2.h> /* Borland C */
|
# include <winsock2.h> /* Borland C */
|
||||||
diff -urN a/README.txt b/README.txt
|
diff -urN a/README.txt b/README.txt
|
||||||
--- a/README.txt 2010-09-19 01:20:17.000000000 +0200
|
--- a/README.txt 2010-09-19 01:20:17.000000000 +0200
|
||||||
+++ b/README.txt 2010-09-20 11:18:56.574175394 +0200
|
+++ b/README.txt 2010-09-20 11:18:56.574175394 +0200
|
||||||
@@ -238,7 +238,7 @@
|
@@ -238,7 +238,7 @@
|
||||||
|
|
||||||
Win32 builds of clients and services requires winsock.dll. To do this in
|
Win32 builds of clients and services requires winsock.dll. To do this in
|
||||||
Visual C++ 6.0, go to "Project", "settings", select the "Link" tab (the
|
Visual C++ 6.0, go to "Project", "settings", select the "Link" tab (the
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue