You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by tr...@locus.apache.org on 2000/12/01 22:33:58 UTC
cvs commit: apr/include apr.h.in
trawick 00/12/01 13:33:58
Modified: . CHANGES acconfig.h configure.in
include apr.h.in
Log:
Add APR_SIZE_T_FMT to help work around the fact that apr_size_t/
apr_ssize_t is long on AIX. Get the other APR_xx_T_FMT variables
defined properly on AIX.
Revision Changes Path
1.12 +3 -0 apr/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr/CHANGES,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- CHANGES 2000/12/01 18:48:45 1.11
+++ CHANGES 2000/12/01 21:33:57 1.12
@@ -1,4 +1,7 @@
Changes with APR a9
+ *) Add APR_SIZE_T_FMT. Get the other APR_xx_T_FMT variables
+ defined properly on AIX. [Jeff Trawick]
+
*) network API changes: get rid of apr_get_socket_inaddr(),
apr_get_remote_name(), and apr_get_local_name() [Jeff Trawick]
1.36 +1 -0 apr/acconfig.h
Index: acconfig.h
===================================================================
RCS file: /home/cvs/apr/acconfig.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- acconfig.h 2000/09/22 11:37:05 1.35
+++ acconfig.h 2000/12/01 21:33:57 1.36
@@ -29,6 +29,7 @@
#undef USE_THREADS
#undef SIZEOF_SSIZE_T
+#undef SIZEOF_SIZE_T
#undef SIZEOF_OFF_T
#undef HAVE_MM_SHMT_MMFILE
1.180 +21 -4 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- configure.in 2000/12/01 16:12:20 1.179
+++ configure.in 2000/12/01 21:33:57 1.180
@@ -409,6 +409,16 @@
ssize_t_fmt='#error Can not determine the proper size for ssize_t'
fi
+AC_CHECK_SIZEOF_EXTENDED([#include <stddef.h>], size_t, 8)
+
+if test "$ac_cv_sizeof_size_t" = "$ac_cv_sizeof_int"; then
+ size_t_fmt='#define APR_SIZE_T_FMT "d"'
+elif test "$ac_cv_sizeof_size_t" = "$ac_cv_sizeof_long"; then
+ size_t_fmt='#define APR_SIZE_T_FMT "ld"'
+else
+ size_t_fmt='#error Can not determine the proper size for size_t'
+fi
+
AC_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], off_t, 8)
if test "$ac_cv_sizeof_off_t" = "$ac_cv_sizeof_int"; then
@@ -421,13 +431,19 @@
off_t_fmt='#error Can not determine the proper size for off_t'
fi
-# basically, we have tried to figure out the sizes of apr_ssize_t and
-# apr_off_t, but we don't always get it right. If you find that we
-# don't get it right for your platform, you can override our decision
-# below.
+# Basically, we have tried to figure out the correct format strings
+# for APR types which vary between platforms, but we don't always get
+# it right. If you find that we don't get it right for your platform,
+# you can override our decision below.
case "$OS" in
*linux* | *os2_emx | *-solaris*)
off_t_fmt='#define APR_OFF_T_FMT "ld"'
+ ;;
+ *aix4*)
+ ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"'
+ size_t_fmt='#define APR_SIZE_T_FMT "ld"'
+ off_t_fmt='#define APR_OFF_T_FMT "ld"'
+ ;;
esac
AC_SUBST(short_value)
@@ -438,6 +454,7 @@
AC_SUBST(ssize_t_value)
AC_SUBST(socklen_t_value)
AC_SUBST(ssize_t_fmt)
+AC_SUBST(size_t_fmt)
AC_SUBST(off_t_fmt)
dnl #----------------------------- Checking for string functions
1.53 +3 -0 apr/include/apr.h.in
Index: apr.h.in
===================================================================
RCS file: /home/cvs/apr/include/apr.h.in,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- apr.h.in 2000/12/01 14:00:54 1.52
+++ apr.h.in 2000/12/01 21:33:58 1.53
@@ -183,6 +183,9 @@
*/
@ssize_t_fmt@
+/* And APR_SIZE_T_FMT */
+@size_t_fmt@
+
/* And APR_OFF_T_FMT */
@off_t_fmt@