Author: rjung
Date: Fri May 26 00:12:38 2006
New Revision: 409572
URL: http://svn.apache.org/viewvc?rev=409572&view=rev
Log:
- Use previous types for WIN32
- Don't assume we have auto* on AS400
Modified:
tomcat/connectors/trunk/jk/native/common/jk_global.h
Modified: tomcat/connectors/trunk/jk/native/common/jk_global.h
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_global.h?rev=409572&r1=409571&r2=409572&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_global.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_global.h Fri May 26 00:12:38
2006
@@ -245,12 +245,19 @@
/* jk_uint32_t defines a four byte word */
/* jk_uint64_t defines a eight byte word */
#if defined (WIN32)
- typedef UINT32 jk_uint32_t;
-#define JK_UINT32_T_FMT "I32u"
-#define JK_UINT32_T_HEX_FMT "I32x"
- typedef UINT64 jk_uint64_t;
+ typedef unsigned int jk_uint32_t;
+#define JK_UINT32_T_FMT "u"
+#define JK_UINT32_T_HEX_FMT "x"
+ typedef unsigned __int64 jk_uint64_t;
#define JK_UINT64_T_FMT "I64u"
#define JK_UINT64_T_HEX_FMT "I64x"
+#elif defined(AS400)
+ typedef unsigned int jk_uint32_t;
+#define JK_UINT32_T_FMT "u"
+#define JK_UINT32_T_HEX_FMT "x"
+ typedef unsigned long long jk_uint64_t;
+#define JK_UINT64_T_FMT "llu"
+#define JK_UINT64_T_HEX_FMT "llx"
#else
#include "jk_types.h"
#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
