diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:50 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:50 -0600 |
| commit | b363d2579af0a11b77e698aed2e1021c2233b644 (patch) | |
| tree | f4a47b87354b7a6a3b266c8121bd8ddaeb7accaa /tderesources/groupwise/soap/patches/socklen.diff | |
| parent | 61bddfe3a7226b18c68a76124b727c736f431688 (diff) | |
| download | tdepim-b363d2579af0a11b77e698aed2e1021c2233b644.tar.gz tdepim-b363d2579af0a11b77e698aed2e1021c2233b644.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'tderesources/groupwise/soap/patches/socklen.diff')
| -rw-r--r-- | tderesources/groupwise/soap/patches/socklen.diff | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/tderesources/groupwise/soap/patches/socklen.diff b/tderesources/groupwise/soap/patches/socklen.diff new file mode 100644 index 000000000..e6494bc96 --- /dev/null +++ b/tderesources/groupwise/soap/patches/socklen.diff @@ -0,0 +1,28 @@ +Index: soap/stdsoap2.cpp +=================================================================== +RCS file: /home/kde/tdepim/tderesources/groupwise/soap/stdsoap2.cpp,v +retrieving revision 1.3 +diff -u -3 -p -r1.3 stdsoap2.cpp +--- soap/stdsoap2.cpp 3 Dec 2004 17:15:43 -0000 1.3 ++++ soap/stdsoap2.cpp 6 Dec 2004 21:27:25 -0000 +@@ -3072,7 +3072,7 @@ tcp_connect(struct soap *soap, const cha + #elif defined(WIN32) || defined(__APPLE__) || defined(HP_UX) || defined(SUN_OS) || defined(OPENSERVER) || defined(TRU64) || defined(VXWORKS) + int n = sizeof(struct sockaddr_in); + #else +- size_t n = sizeof(struct sockaddr_in); ++ kde_socklen_t n = sizeof(struct sockaddr_in); + #endif + fd_set fds; + if (soap->connect_timeout > 0) +@@ -3503,7 +3503,10 @@ tcp_accept(struct soap *soap, int s, str + #elif defined(WIN32) || defined(__APPLE__) || defined(HP_UX) || defined(SUN_OS) || defined(OPENSERVER) || defined(TRU64) || defined(VXWORKS) + fd = (int)accept((SOAP_SOCKET)s, a, n); + #else +- fd = (int)accept((SOAP_SOCKET)s, a, (size_t*)n); ++ kde_socklen_t n_size = 0; ++ if (n) n_size = *n; ++ fd = (int)accept((SOAP_SOCKET)s, a, &n_size); ++ if (n) *n = n_size; + #endif + #ifdef SOCKET_CLOSE_ON_EXEC + #ifdef WIN32 |