tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jfcl...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native/common jk_global.h jk_md5.h
Date Tue, 14 Jun 2005 15:44:22 GMT
jfclere     2005/06/14 08:44:22

  Modified:    jk/native configure.in
               jk/native/common jk_global.h jk_md5.h
  Log:
  detect in configure the int32 and int64 (and add if defined(AS400)).
  
  Revision  Changes    Path
  1.47      +20 -1     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.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- configure.in	1 Jun 2005 03:53:58 -0000	1.46
  +++ configure.in	14 Jun 2005 15:44:22 -0000	1.47
  @@ -50,6 +50,25 @@
   dnl AC_PATH_PROG(LIBTOOL,libtool,$PATH)dnl
   AC_SUBST(LIBTOOL)
   
  +AC_CHECK_SIZEOF(uint32_t)
  +AC_CHECK_SIZEOF(u_int32_t)
  +AC_CHECK_SIZEOF(unsigned long)
  +
  +AC_CHECK_SIZEOF(unsigned int)
  +AC_CHECK_SIZEOF(unsigned long long)
  +AC_CHECK_SIZEOF(unsigned longlong)
  +if test "$ac_cv_sizeof_unsigned_int" = "8"; then
  +    AC_DEFINE(HAVE_INT64, [], [Use int for JK_UINT8])
  +elif test "$ac_cv_sizeof_unsigned_long" = "8"; then
  +    AC_DEFINE(HAVE_LONG64, [], [Use long for JK_UINT8])
  +elif test "$ac_cv_sizeof_unsigned_long_long" = "8"; then
  +    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 
  +    AC_ERROR([could not detect a 64-bit integer type])
  +fi
  +
   dnl check for snprintf and vsnprintf.
   AC_CHECK_FUNC(snprintf, AC_DEFINE(HAVE_SNPRINTF,1,[Have snprintf()]))
   AC_CHECK_FUNC(vsnprintf, AC_DEFINE(HAVE_VSNPRINTF,1,[Have vsnprintf()]))
  
  
  
  1.51      +8 -2      jakarta-tomcat-connectors/jk/native/common/jk_global.h
  
  Index: jk_global.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_global.h,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- jk_global.h	14 Jun 2005 06:34:13 -0000	1.50
  +++ jk_global.h	14 Jun 2005 15:44:22 -0000	1.51
  @@ -254,8 +254,14 @@
   #define vsnprintf _vsnprintf
   #endif
   typedef unsigned __int64 jk_u64_t;
  -#else
  +#elif defined(HAVE_LONG_LONG64) || defined(AS400)
   typedef unsigned long long jk_u64_t;
  +#elif defined(HAVE_LONGLONG64)
  +typedef unsigned longlong jk_u64_t;
  +#elif defined(HAVE_LONG64)
  +typedef unsigned long jk_u64_t;
  +#else
  +typedef unsigned int jk_u64_t; /* HAVE_INT64 ! */
   #endif
   
   /* Use apr snprintf() and vsnprintf() when needed */
  
  
  
  1.8       +5 -1      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- jk_md5.h	2 Dec 2004 06:50:01 -0000	1.7
  +++ jk_md5.h	14 Jun 2005 15:44:22 -0000	1.8
  @@ -61,8 +61,12 @@
       typedef DWORD JK_UINT4;
   #elif defined(NETWARE) && !defined(__NOVELL_LIBC__)
       typedef unsigned int JK_UINT4;
  -#else
  +#elif defined(SIZEOF_UINT32_T)
       typedef uint32_t JK_UINT4;
  +#elif defined(SIZEOF_U_INT32_T)
  +    typedef u_int32_t JK_UINT4;
  +#else
  +    typedef unsigned long JK_UINT4; /* ansi */
   #endif
   
   /* MD5 context. */
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message