jfclere 2005/07/05 23:58:50
Modified: jk/native configure.in
jk/native/common jk_md5.h
Log:
use the same logic for jk_u64_ and JK_UINT4.
Revision Changes Path
1.48 +12 -2 jakarta-tomcat-connectors/jk/native/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/configure.in,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- configure.in 14 Jun 2005 15:44:22 -0000 1.47
+++ configure.in 6 Jul 2005 06:58:49 -0000 1.48
@@ -53,6 +53,15 @@
AC_CHECK_SIZEOF(uint32_t)
AC_CHECK_SIZEOF(u_int32_t)
AC_CHECK_SIZEOF(unsigned long)
+if test "$ac_cv_sizeof_uint32_t" = "4"; then
+ AC_DEFINE(HAVE_UINT32_T, [], [Use uint32_t for JK_UINT4])
+elif test "$ac_cv_sizeof_u_int32_t" = "4"; then
+ AC_DEFINE(HAVE_U_INT32_T, [], [Use u_int32_t for JK_UINT4])
+elif test "$ac_cv_sizeof_unsigned_long" = "4"; then
+ AC_DEFINE(HAVE_LONG, [], [Use unsigned long for JK_UINT4])
+else
+ AC_ERROR([could not detect a 32-bit integer type])
+fi
AC_CHECK_SIZEOF(unsigned int)
AC_CHECK_SIZEOF(unsigned long long)
@@ -65,7 +74,7 @@
AC_DEFINE(HAVE_LONG_LONG64, [], [Use long long for JK_UINT8])
elif test "$ac_cv_sizeof_unsigned_longlong" = "8"; then
AC_DEFINE(HAVE_LONGLONG64, [], [Use longlong for JK_UINT8])
-else
+else
AC_ERROR([could not detect a 64-bit integer type])
fi
@@ -171,6 +180,7 @@
for INC in ${INCTEMP}; do
APRINCLUDEDIR="${APRINCLUDEDIR} -I${INC}"
done
+ AC_MSG_RESULT([APRINCLUDEDIR is $APRINCLUDEDIR])
APXSCFLAGS="`${APXS} -q CFLAGS` `${APXS} -q
EXTRA_CFLAGS` -DHAVE_APR ${APRINCLUDEDIR}"
APXSCPPFLAGS="`${APXS} -q EXTRA_CPPFLAGS`"
APACHE_CONFIG_VARS="`${APXS} -q
exp_installbuilddir`/config_vars.mk"
1.10 +3 -3 jakarta-tomcat-connectors/jk/native/common/jk_md5.h
Index: jk_md5.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_md5.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jk_md5.h 5 Jul 2005 16:22:21 -0000 1.9
+++ jk_md5.h 6 Jul 2005 06:58:49 -0000 1.10
@@ -61,12 +61,12 @@
typedef DWORD JK_UINT4;
#elif defined(NETWARE) && !defined(__NOVELL_LIBC__)
typedef unsigned int JK_UINT4;
-#elif SIZEOF_UINT32_T
+#elif defined(HAVE_UINT32_T)
typedef uint32_t JK_UINT4;
-#elif SIZEOF_U_INT32_T
+#elif defined(HAVE_U_INT32_T)
typedef u_int32_t JK_UINT4;
#else
- typedef unsigned long JK_UINT4; /* ansi */
+ typedef unsigned long JK_UINT4; /* ansi HAVE_LONG */
#endif
/* MD5 context. */
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
