diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-09-01 10:01:37 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-09-01 16:43:55 +0900 |
| commit | f963717fee43b79ecbda8bf7d6ae3f41c796a484 (patch) | |
| tree | 0a61c6b8fc787acafa497fe1ee86a5e6966db734 | |
| parent | 829b015f6e55dafa7e4bedc6d456518db51bbe0d (diff) | |
| download | tdepim-f963717fee43b79ecbda8bf7d6ae3f41c796a484.tar.gz tdepim-f963717fee43b79ecbda8bf7d6ae3f41c796a484.zip | |
Drop Symbian support
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 889e93b72081a12bb3767b5c4fa6e351362abd37)
| -rw-r--r-- | tderesources/groupwise/soap/stdsoap2.cpp | 3 | ||||
| -rw-r--r-- | tderesources/groupwise/soap/stdsoap2.h | 31 |
2 files changed, 4 insertions, 30 deletions
diff --git a/tderesources/groupwise/soap/stdsoap2.cpp b/tderesources/groupwise/soap/stdsoap2.cpp index b83b2bb49..e3d42998e 100644 --- a/tderesources/groupwise/soap/stdsoap2.cpp +++ b/tderesources/groupwise/soap/stdsoap2.cpp @@ -3827,9 +3827,6 @@ soap_accept(struct soap *soap) #elif defined(PALM) fcntl((SOAP_SOCKET)soap->master, F_SETFL, fcntl((SOAP_SOCKET)soap->master, F_GETFL,0)&~O_NONBLOCK); fcntl((SOAP_SOCKET)soap->socket, F_SETFL, fcntl((SOAP_SOCKET)soap->socket, F_GETFL,0)&~O_NONBLOCK); -#elif defined(SYMBIAN) - long blocking = 0; - ioctl((SOAP_SOCKET)soap->master, 0/*FIONBIO*/, &blocking); #else fcntl((SOAP_SOCKET)soap->master, F_SETFL, fcntl((SOAP_SOCKET)soap->master, F_GETFL)&~O_NONBLOCK); fcntl((SOAP_SOCKET)soap->socket, F_SETFL, fcntl((SOAP_SOCKET)soap->socket, F_GETFL)&~O_NONBLOCK); diff --git a/tderesources/groupwise/soap/stdsoap2.h b/tderesources/groupwise/soap/stdsoap2.h index b68c24077..adb5037b5 100644 --- a/tderesources/groupwise/soap/stdsoap2.h +++ b/tderesources/groupwise/soap/stdsoap2.h @@ -153,11 +153,6 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com # endif #endif -#ifdef __SYMBIAN32__ -# define SYMBIAN -# undef WIN32 -#endif - #if defined(__palmos__) || defined(PALM_GCC) || defined(__PALMOS_TRAPS__) # ifndef PALM # define PALM @@ -333,12 +328,6 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com # define O_NONBLOCK FNONBIO # include <sys_socket.h> # include "palmFunctions.h" -# elif defined(SYMBIAN) -# define WITH_LEAN -# define WITH_NONAMESPACES -# define HAVE_STRTOD /* use STRTOD since sscanf doesn't seem to work */ -# include <e32def.h> -# include <sys/ioctl.h> # elif defined(VXWORKS) # define HAVE_STRRCHR # define HAVE_STRTOD @@ -445,9 +434,7 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com # include <sockLib.h> # endif # ifndef VXWORKS -# ifndef SYMBIAN -# include <strings.h> -# endif +# include <strings.h> # endif # ifdef SUN_OS # include <sys/stream.h> /* SUN */ @@ -565,10 +552,7 @@ extern "C" { #define SOAP_INVALID_SOCKET (-1) #define soap_valid_socket(n) ((n) != SOAP_INVALID_SOCKET) -#if defined(SYMBIAN) -# define LONG64 long -# define ULONG64 unsigned LONG64 -#elif !defined(WIN32) || defined(__GLIBC__) || defined(__GNU__) +#if !defined(WIN32) || defined(__GLIBC__) || defined(__GNU__) # ifndef LONG64 # define LONG64 long long # define ULONG64 unsigned LONG64 @@ -583,8 +567,6 @@ extern "C" { #if defined(WIN32) # define soap_int32 __int32 -#elif defined(SYMBIAN) -# define soap_int32 long #elif defined(PALM) # define soap_int32 Int32 #else @@ -601,13 +583,8 @@ extern "C" { # define SOAP_ERANGE ERANGE # define SOAP_EINTR EINTR # define SOAP_EAGAIN EAGAIN -# ifdef SYMBIAN -# define SOAP_EWOULDBLOCK 9898 -# define SOAP_EINPROGRESS 9899 -# else -# define SOAP_EWOULDBLOCK EWOULDBLOCK -# define SOAP_EINPROGRESS EINPROGRESS -# endif +# define SOAP_EWOULDBLOCK EWOULDBLOCK +# define SOAP_EINPROGRESS EINPROGRESS #endif #ifdef WIN32 |