You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by jo...@apache.org on 2004/01/29 09:33:41 UTC
cvs commit: apr configure.in CHANGES
jorton 2004/01/29 00:33:41
Modified: . Tag: APR_0_9_BRANCH configure.in CHANGES
Log:
* configure.in: Define apr_off_t as an apr_intX_t type rather than
off_t to prevent the size of apr_off_t being affected by the
_FILE_OFFSET_BITS definition on LFS systems. (since Other Software is
known to export changes to _FILE_OFFSET_BITS as part of its API)
Note:
1) the size of apr_off_t is still affected by _FILE_OFFSET_BITS if
defined at configure-time, as expected.
2) apr_off_t will have changed from a long to an int on some 32-bit
platforms; APR_OFF_T_FMT has changed from "ld" to "d" accordingly.
Submitted by: Ben Reser <be...@reser.org>
Revision Changes Path
No revision
No revision
1.535.2.4 +17 -18 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.535.2.3
retrieving revision 1.535.2.4
diff -b -d -u -r1.535.2.3 -r1.535.2.4
--- configure.in 27 Jan 2004 09:59:31 -0000 1.535.2.3
+++ configure.in 29 Jan 2004 08:33:41 -0000 1.535.2.4
@@ -1139,11 +1139,6 @@
stdint=0
fi
-if test "$ac_cv_type_off_t" = "yes"; then
- off_t_value="off_t"
-else
- off_t_value="apr_int32_t"
-fi
if test "$ac_cv_type_size_t" = "yes"; then
size_t_value="size_t"
else
@@ -1180,16 +1175,24 @@
size_t_fmt='#error Can not determine the proper size for size_t'
fi
-APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], off_t, 8)
-
-if test "$ac_cv_sizeof_off_t" = "$ac_cv_sizeof_int"; then
- off_t_fmt='#define APR_OFF_T_FMT "d"'
-elif test "$ac_cv_sizeof_off_t" = "$ac_cv_sizeof_long"; then
- off_t_fmt='#define APR_OFF_T_FMT "ld"'
-elif test "$ac_cv_sizeof_off_t" = "$ac_cv_sizeof_long_long"; then
+if test "$ac_cv_type_off_t" = "yes"; then
+ APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], off_t, 8)
+ if test "$ac_cv_sizeof_off_t" = "2"; then
+ off_t_value='apr_int16_t'
+ off_t_fmt='#define APR_OFF_T_FMT APR_INT16_T_FMT'
+ elif test "$ac_cv_sizeof_off_t" = "4"; then
+ off_t_value='apr_int32_t'
+ off_t_fmt='#define APR_OFF_T_FMT APR_INT32_T_FMT'
+ elif test "$ac_cv_sizeof_off_t" = "8"; then
+ off_t_value='apr_int64_t'
off_t_fmt='#define APR_OFF_T_FMT APR_INT64_T_FMT'
-else
+ else
+ off_t_value='apr_int64_t'
off_t_fmt='#error Can not determine the proper size for off_t'
+ fi
+else
+ off_t_value='apr_int32_t'
+ off_t_fmt='#define APR_OFF_T_FMT APR_INT32_T_FMT'
fi
APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], pid_t, 8)
@@ -1212,7 +1215,6 @@
# you can override our decision below.
case $host in
*linux*)
- off_t_fmt='#define APR_OFF_T_FMT "ld"'
case $host in
s390*)
size_t_fmt='#define APR_SIZE_T_FMT "ld"'
@@ -1220,17 +1222,14 @@
esac
;;
*os2_emx)
- off_t_fmt='#define APR_OFF_T_FMT "ld"'
size_t_fmt='#define APR_SIZE_T_FMT "lu"'
;;
*-solaris*)
- off_t_fmt='#define APR_OFF_T_FMT "ld"'
pid_t_fmt='#define APR_PID_T_FMT "ld"'
;;
*aix4*|*aix5*)
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"'
;;
*beos*)
ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"'
1.426.2.7 +5 -0 apr/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr/CHANGES,v
retrieving revision 1.426.2.6
retrieving revision 1.426.2.7
diff -b -d -u -r1.426.2.6 -r1.426.2.7
--- CHANGES 16 Dec 2003 18:26:33 -0000 1.426.2.6
+++ CHANGES 29 Jan 2004 08:33:41 -0000 1.426.2.7
@@ -1,5 +1,10 @@
Changes with APR 0.9.5
+ *) Define apr_off_t as apr_intX_t rather than as off_t to prevent
+ incompatibility with packages such as Perl which redefine the
+ size of off_t via _FILE_OFFSET_BITS on some platforms.
+ [Ben Reser <ben reser.org>]
+
*) apr_socket_connect(): allow app to make subsequent call on
non-blocking socket. [Jeff Trawick]
Re: cvs commit: apr configure.in CHANGES
Posted by Joe Orton <jo...@manyfish.co.uk>.
On Thu, Jan 29, 2004 at 08:44:07AM -0500, Jeff Trawick wrote:
> APR_INT32_T_FMT isn't showing up in apr.h for me, leading to compile
> failure for references to APR_OFF_T_FMT
Sorry, fixed now.
Re: cvs commit: apr configure.in CHANGES
Posted by Jeff Trawick <tr...@attglobal.net>.
jorton@apache.org wrote:
> jorton 2004/01/29 00:33:41
>
> Modified: . Tag: APR_0_9_BRANCH configure.in CHANGES
> Log:
> * configure.in: Define apr_off_t as an apr_intX_t type rather than
> off_t to prevent the size of apr_off_t being affected by the
> _FILE_OFFSET_BITS definition on LFS systems. (since Other Software is
> known to export changes to _FILE_OFFSET_BITS as part of its API)
> Index: configure.in
> ===================================================================
> RCS file: /home/cvs/apr/configure.in,v
> retrieving revision 1.535.2.3
> retrieving revision 1.535.2.4
> diff -b -d -u -r1.535.2.3 -r1.535.2.4
> --- configure.in 27 Jan 2004 09:59:31 -0000 1.535.2.3
> +++ configure.in 29 Jan 2004 08:33:41 -0000 1.535.2.4
> + elif test "$ac_cv_sizeof_off_t" = "4"; then
> + off_t_value='apr_int32_t'
> + off_t_fmt='#define APR_OFF_T_FMT APR_INT32_T_FMT'
APR_INT32_T_FMT isn't showing up in apr.h for me, leading to compile failure
for references to APR_OFF_T_FMT