rbb 99/07/12 11:38:26
Modified: apr configure.in include apr_general.h Log: I'm doing the integer size checks properly now in APR. At least I think I am. :) Revision Changes Path 1.26 +8 -0 apache-apr/apr/configure.in Index: configure.in =================================================================== RCS file: /home/cvs/apache-apr/apr/configure.in,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- configure.in 1999/07/01 20:11:06 1.25 +++ configure.in 1999/07/12 18:38:19 1.26 @@ -15,6 +15,14 @@ AC_CHECK_PROG(RM, rm, rm) AC_CHECK_PROG(AR, ar, ar) +dnl Checks for integer size +AC_CHECK_SIZEOF(char, 1) +AC_CHECK_SIZEOF(int, 4) +AC_CHECK_SIZEOF(long, 4) +AC_CHECK_SIZEOF(short, 2) +AC_CHECK_SIZEOF(long double, 12) +AC_CHECK_SIZEOF(long long, 8) + # Use /bin/sh if it exists, otherwise go looking for sh in the path if (test -z "$SH" -a -e /bin/sh); then SH="/bin/sh" 1.21 +20 -6 apache-apr/include/apr_general.h Index: apr_general.h =================================================================== RCS file: /home/cvs/apache-apr/include/apr_general.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- apr_general.h 1999/06/30 19:45:58 1.20 +++ apr_general.h 1999/07/12 18:38:24 1.21 @@ -87,12 +87,26 @@ #define MAXIMUM_WAIT_OBJECTS 64 -typedef short ap_int16_t; -typedef unsigned short ap_uint16_t; -typedef int ap_int32_t; -typedef unsigned int ap_uint32_t; -typedef long ap_int64_t; -typedef unsigned long ap_uint64_t; +#if (SIZEOF_SHORT == 2) +typedef short ap_int16_t; +typedef unsigned short ap_uint16_t; +#endif + +#if (SIZEOF_INT == 4) +typedef int ap_int32_t; +typedef unsigned int ap_uint32_t; +#endif + +#if (SIZEOF_LONG == 8) +typedef long ap_int64_t; +typedef unsigned long ap_uint64_t; +#elif (SIZEOF_LONG_LONG == 8) +typedef long long ap_int64_t; +typedef unsigned long long ap_uint64_t; +#elif (SIZEOF_LONG_DOUBLE == 8) +typedef long double ap_int64_t; +typedef unsigned long double ap_uint64_t; +#endif typedef size_t ap_size_t; #ifdef ssize_t