Update of /cvsroot/syncml-ctoolkit/toolkit/src/xpt/bindings/common/tcp/all
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7869/syncml_tk_sf_checkout/toolkit/src/xpt/bindings/common/tcp/all
Modified Files:
xpttypes.h
Log Message:
added propagation of user abort error condition from tcp->http->xpt->sysync to avoid retries when user abort is detected on tcp level (e.g. for Symbian)
Index: xpttypes.h
===================================================================
RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/xpt/bindings/common/tcp/all/xpttypes.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** xpttypes.h 24 May 2004 01:33:41 -0000 1.3
--- xpttypes.h 18 Jan 2005 21:01:39 -0000 1.4
***************
*** 53,69 ****
#endif
!
#ifndef Bool_t
! #if defined(__INIT_SML_XPT_GLOBALS) || defined(__cplusplus)
typedef bool Bool_t;
#else
! #if defined(_WIN32) || defined(linux) || defined(__GCC32__)
// for C compilers without C99 extensions
! typedef enum { false = 0,
true = 1 } Bool_t;
#else
! typedef int Bool_t;
#endif
#endif
#endif
--- 53,91 ----
#endif
! /* %%% dangerous, we should not try too much magic here, as
! it might cause VERY strange linking issues
#ifndef Bool_t
! #if defined(__INIT_SML_XPT_GLOBALS)
typedef bool Bool_t;
#else
! //#if defined(_WIN32) || defined(linux) || defined(__GCC32__)
! #if defined(linux) || defined(__GCC32__)
// for C compilers without C99 extensions
! typedef enum { FALSE = 0,
true = 1 } Bool_t;
+ #elif (defined(_WIN32) && !defined(__cplusplus))
+ // MSVC does not like typedef enum with "false" and "true" keywords
+ #define false 0
+ #define true 1
+ typedef short int Bool_t;
#else
! // compilers that alread know "true" and "false"
! typedef short int Bool_t;
#endif
+ #endif
+ // make sure it is defined now
+ #define Bool_t Bool_t
+ #endif
+ */
+
+ // Simple short for booleans
+ typedef short int Bool_t;
+ // make sure we can #ifdef it
+ #define Bool_t Bool_t
+ #ifndef TRUE
+ #define TRUE 1
#endif
+ #ifndef FALSE
+ #define FALSE 0
#endif
|
