Author: rjung
Date: Sun May 21 05:49:06 2006
New Revision: 408166
URL: http://svn.apache.org/viewvc?rev=408166&view=rev
Log:
Split 32/64Bit-detection between Win32 and other platforms.
Win32 goes into jk_global.h, the other ones use autoconf.
Added:
tomcat/connectors/trunk/jk/native/common/jk_global.h
- copied, changed from r408153, tomcat/connectors/trunk/jk/native/common/jk_global.h.in
tomcat/connectors/trunk/jk/native/common/jk_types.h.in (with props)
Removed:
tomcat/connectors/trunk/jk/native/common/jk_global.h.in
Modified:
tomcat/connectors/trunk/jk/native/configure.in
Copied: tomcat/connectors/trunk/jk/native/common/jk_global.h (from r408153, tomcat/connectors/trunk/jk/native/common/jk_global.h.in)
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_global.h?p2=tomcat/connectors/trunk/jk/native/common/jk_global.h&p1=tomcat/connectors/trunk/jk/native/common/jk_global.h.in&r1=408153&r2=408166&rev=408166&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_global.h.in (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_global.h Sun May 21 05:49:06 2006
@@ -24,12 +24,6 @@
#ifndef JK_GLOBAL_H
#define JK_GLOBAL_H
-/* GENERATED FILE WARNING! DO NOT EDIT jk_global.h
- *
- * You must modify jk_global.h.in instead.
- *
- */
-
#ifndef NETWARE
#if !defined(WIN32) && !defined(AS400)
#include "portable.h"
@@ -249,53 +243,20 @@
#endif /* APR_CHARSET_EBCDIC */
/* 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_INT32_T_FMT "I32d"
#define JK_UINT32_T_FMT "I32u"
#define JK_UINT32_T_HEX_FMT "I32x"
-#elif defined(NETWARE) && !defined(__NOVELL_LIBC__)
- typedef unsigned int jk_uint32_t;
-#else
- typedef unsigned @int32_value@ jk_uint32_t;
-
-/* And JK_INT32_T_FMT */
-@int32_t_fmt@
-
-/* And JK_UINT32_T_FMT */
-@uint32_t_fmt@
-
-/* And JK_UINT32_T_HEX_FMT */
-@uint32_t_hex_fmt@
-#endif
-#define JK_INT32_T_FMT_LEN (sizeof(JK_INT32_T_FMT) - 1)
-#define JK_UINT32_T_FMT_LEN (sizeof(JK_UINT32_T_FMT) - 1)
-#define JK_UINT32_T_HEX_FMT_LEN (sizeof(JK_UINT32_T_HEX_FMT) - 1)
-
-/* jk_uint64_t defines a four byte word */
-#if defined (WIN32)
typedef UINT64 jk_uint64_t;
-#define JK_INT64_T_FMT "I64d"
#define JK_UINT64_T_FMT "I64u"
#define JK_UINT64_T_HEX_FMT "I64x"
-#elif defined(AS400)
- typedef unsigned long long jk_uint64_t;
-#define JK_INT64_T_FMT "lld"
-#define JK_UINT64_T_FMT "llu"
-#define JK_UINT64_T_HEX_FMT "llx"
#else
- typedef unsigned @int64_value@ jk_uint64_t;
-
-/* And JK_INT64_T_FMT */
-@int64_t_fmt@
-
-/* And JK_UINT64_T_FMT */
-@uint64_t_fmt@
-
-/* And JK_UINT64_T_HEX_FMT */
-@uint64_t_hex_fmt@
+#include "jk_types.h"
#endif
-#define JK_INT64_T_FMT_LEN (sizeof(JK_INT64_T_FMT) - 1)
+
+#define JK_UINT32_T_FMT_LEN (sizeof(JK_UINT32_T_FMT) - 1)
+#define JK_UINT32_T_HEX_FMT_LEN (sizeof(JK_UINT32_T_HEX_FMT) - 1)
#define JK_UINT64_T_FMT_LEN (sizeof(JK_UINT64_T_FMT) - 1)
#define JK_UINT64_T_HEX_FMT_LEN (sizeof(JK_UINT64_T_HEX_FMT) - 1)
Added: tomcat/connectors/trunk/jk/native/common/jk_types.h.in
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_types.h.in?rev=408166&view=auto
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_types.h.in (added)
+++ tomcat/connectors/trunk/jk/native/common/jk_types.h.in Sun May 21 05:49:06 2006
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/***************************************************************************
+ * Description: Platform specific, auto-detected types. *
+ * Author: Rainer Jung <rjung@apache.org> *
+ * Version: $Revision$ *
+ ***************************************************************************/
+
+#ifndef JK_TYPES_H
+#define JK_TYPES_H
+
+/* GENERATED FILE WARNING! DO NOT EDIT jk_types.h
+ *
+ * You must modify jk_types.h.in instead.
+ *
+ */
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+/* jk_uint32_t defines a four byte word */
+typedef unsigned @int32_value@ jk_uint32_t;
+
+/* And JK_UINT32_T_FMT */
+@uint32_t_fmt@
+
+/* And JK_UINT32_T_HEX_FMT */
+@uint32_t_hex_fmt@
+
+/* jk_uint64_t defines a eight byte word */
+typedef unsigned @int64_value@ jk_uint64_t;
+
+/* And JK_UINT64_T_FMT */
+@uint64_t_fmt@
+
+/* And JK_UINT64_T_HEX_FMT */
+@uint64_t_hex_fmt@
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* JK_TYPES_H */
Propchange: tomcat/connectors/trunk/jk/native/common/jk_types.h.in
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/connectors/trunk/jk/native/common/jk_types.h.in
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: tomcat/connectors/trunk/jk/native/configure.in
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/configure.in?rev=408166&r1=408165&r2=408166&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/configure.in (original)
+++ tomcat/connectors/trunk/jk/native/configure.in Sun May 21 05:49:06 2006
@@ -617,6 +617,6 @@
apache-2.0/Makefile.apxs
common/Makefile
common/list.mk
- common/jk_global.h
+ common/jk_types.h
jni/Makefile
])
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
|