From kde-commits Mon Aug 06 17:50:08 2007 From: Allen Winter Date: Mon, 06 Aug 2007 17:50:08 +0000 To: kde-commits Subject: KDE/kdepim/kresources/groupwise/soap Message-Id: <1186422608.206353.13375.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=118642262231352 SVN commit 697070 by winterz: forward port SVN commit 695474 by hasso: Make it work for NetBSD and DragonFly. Patch obtained from pkgsrc. M +5 -5 stdsoap2.h --- trunk/KDE/kdepim/kresources/groupwise/soap/stdsoap2.h #697069:697070 @@ -153,7 +153,7 @@ # endif #endif -#ifdef __SYMBIAN32__ +#ifdef __SYMBIAN32__ # define SYMBIAN # undef WIN32 #endif @@ -545,7 +545,7 @@ /* Portability: define SOAP_SOCKLEN_T */ #if defined(SOCKLEN_T) # define SOAP_SOCKLEN_T SOCKLEN_T -#elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(__QNX__) || defined(QNX) || defined(_AIX) +#elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(__QNX__) || defined(QNX) || defined(_AIX) || defined(__NetBSD__) || defined(__DragonFly__) # define SOAP_SOCKLEN_T socklen_t #elif defined(IRIX) || defined(WIN32) || defined(__APPLE__) || defined(HP_UX) || defined(SUN_OS) || defined(OPENSERVER) || defined(__osf__) || defined(VXWORKS) # define SOAP_SOCKLEN_T int @@ -703,7 +703,7 @@ #endif #ifdef VXWORKS -# ifdef __INCmathh +# ifdef __INCmathh # include # ifndef HAVE_ISNAN # define HAVE_ISNAN @@ -712,7 +712,7 @@ # endif #endif -#ifdef WIN32 +#ifdef WIN32 # include # ifndef HAVE_ISNAN # define HAVE_ISNAN @@ -1700,7 +1700,7 @@ SOAP_FMAC1 char* SOAP_FMAC2 soap_putsizes(struct soap*, const char *, const int *, int); SOAP_FMAC1 char* SOAP_FMAC2 soap_putoffset(struct soap*, int); SOAP_FMAC1 char* SOAP_FMAC2 soap_putoffsets(struct soap*, const int *, int); - + SOAP_FMAC1 int SOAP_FMAC2 soap_closesock(struct soap*); SOAP_FMAC1 struct soap *SOAP_FMAC2 soap_new(void);