You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2007/10/24 06:40:36 UTC
svn commit: r587779 - in /apr/apr/trunk: CHANGES configure.in
include/apr.h.in include/apr.hnw include/apr.hw include/apr_file_info.h
Author: wrowe
Date: Tue Oct 23 21:40:33 2007
New Revision: 587779
URL: http://svn.apache.org/viewvc?rev=587779&view=rev
Log:
Define apr_ino_t in such a way that it doesn't change definition
based on the library consumer's -D'efines to the filesystem.
Submitted by: Lucian Adrian Grijincu <lucian.grijincu gmail.com>
Modified:
apr/apr/trunk/CHANGES
apr/apr/trunk/configure.in
apr/apr/trunk/include/apr.h.in
apr/apr/trunk/include/apr.hnw
apr/apr/trunk/include/apr.hw
apr/apr/trunk/include/apr_file_info.h
Modified: apr/apr/trunk/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/trunk/CHANGES?rev=587779&r1=587778&r2=587779&view=diff
==============================================================================
--- apr/apr/trunk/CHANGES [utf-8] (original)
+++ apr/apr/trunk/CHANGES [utf-8] Tue Oct 23 21:40:33 2007
@@ -1,18 +1,9 @@
- -*- coding: utf-8 -*-
+ -*- coding: utf-8 -*-
Changes for APR 1.3.0
*) Implement apr_atomic_casptr() and apr_atomic_xchgptr() for z/OS.
[David Jones <oscaremma gmail.com>]
- *) Fill in apr_fileinfo_t member st_csize on Netware and Unix (PR 41678),
- and refine the file times down to apr_time_t resolution if supported
- by a st_atimensec or st_atim.tv_nsec value by the OS. Additional
- msec implementations are possible if exposed through autoconf.
- [William Rowe, Nicklas Edmundsson <nikke acc.umu.se>]
-
- *) Fix apr_socket_recvfrom() to ensure the peer's address is returned
- through the "from" parameter on Win32. [William Rowe]
-
*) Introduce apr_file_pipe_create_ex() to portably permit one pipe
end or another to be entirely blocking for non-APR applications
(e.g. stdio streams) and the other (or both ends) non blocking,
@@ -180,6 +171,19 @@
apr_tables.h. [Garrett Rooney]
Changes for APR 1.2.12
+
+ *) Define apr_ino_t in such a way that it doesn't change definition
+ based on the library consumer's -D'efines to the filesystem.
+ [Lucian Adrian Grijincu <lucian.grijincu gmail.com>]
+
+ *) Fill in apr_fileinfo_t member st_csize on Netware and Unix (PR 41678),
+ and refine the file times down to apr_time_t resolution if supported
+ by a st_atimensec or st_atim.tv_nsec value by the OS. Additional
+ msec implementations are possible if exposed through autoconf.
+ [William Rowe, Nicklas Edmundsson <nikke acc.umu.se>]
+
+ *) Fix apr_socket_recvfrom() to ensure the peer's address is returned
+ through the "from" parameter on Win32. [William Rowe]
*) Cause apr_file_dup2() on Win32 to update the MSVCRT psuedo-stdio
handles for fd-based and FILE * based I/O. [William Rowe]
Modified: apr/apr/trunk/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/configure.in?rev=587779&r1=587778&r2=587779&view=diff
==============================================================================
--- apr/apr/trunk/configure.in (original)
+++ apr/apr/trunk/configure.in Tue Oct 23 21:40:33 2007
@@ -530,6 +530,14 @@
if test "$apr_cv_use_lfs64" = "yes"; then
APR_ADDTO(CPPFLAGS, [-D_LARGEFILE64_SOURCE])
fi
+
+
+ dnl define apr_ino_t in a manner independent of _FILE_OFFSET_BITS setting
+ dnl default fallback
+ ino_t_value=ino_t
+ APR_CHECK_TYPES_COMPATIBLE(ino_t, unsigned long long, ino_t_value="unsigned long long")
+ APR_CHECK_TYPES_COMPATIBLE(ino_t, unsigned long, ino_t_value="unsigned long")
+ APR_CHECK_TYPES_COMPATIBLE(ino_t, unsigned int, ino_t_value="unsigned int")
fi
AC_ARG_ENABLE(nonportable-atomics,
@@ -1507,6 +1515,7 @@
AC_SUBST(bigendian)
AC_SUBST(aprlfs)
AC_SUBST(have_iovec)
+AC_SUBST(ino_t_value)
dnl ----------------------------- Checking for string functions
AC_CHECK_FUNCS(strnicmp, have_strnicmp="1", have_strnicmp="0")
Modified: apr/apr/trunk/include/apr.h.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr.h.in?rev=587779&r1=587778&r2=587779&view=diff
==============================================================================
--- apr/apr/trunk/include/apr.h.in (original)
+++ apr/apr/trunk/include/apr.h.in Tue Oct 23 21:40:33 2007
@@ -283,6 +283,7 @@
typedef @ssize_t_value@ apr_ssize_t;
typedef @off_t_value@ apr_off_t;
typedef @socklen_t_value@ apr_socklen_t;
+typedef @ino_t_value@ apr_ino_t;
#define APR_SIZEOF_VOIDP @voidp_size@
Modified: apr/apr/trunk/include/apr.hnw
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr.hnw?rev=587779&r1=587778&r2=587779&view=diff
==============================================================================
--- apr/apr/trunk/include/apr.hnw (original)
+++ apr/apr/trunk/include/apr.hnw Tue Oct 23 21:40:33 2007
@@ -255,6 +255,7 @@
#else
typedef size_t apr_socklen_t;
#endif
+typedef apr_uint64_t apr_ino_t;
/* Are we big endian? */
/* XXX: Fatal assumption on Alpha platforms */
Modified: apr/apr/trunk/include/apr.hw
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr.hw?rev=587779&r1=587778&r2=587779&view=diff
==============================================================================
--- apr/apr/trunk/include/apr.hw (original)
+++ apr/apr/trunk/include/apr.hw Tue Oct 23 21:40:33 2007
@@ -345,6 +345,7 @@
typedef int apr_off_t;
#endif
typedef int apr_socklen_t;
+typedef apr_uint64_t apr_ino_t;
/* Are we big endian? */
/* XXX: Fatal assumption on Alpha platforms */
Modified: apr/apr/trunk/include/apr_file_info.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_file_info.h?rev=587779&r1=587778&r2=587779&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_file_info.h (original)
+++ apr/apr/trunk/include/apr_file_info.h Tue Oct 23 21:40:33 2007
@@ -125,16 +125,10 @@
typedef apr_int32_t apr_fileperms_t;
#if (defined WIN32) || (defined NETWARE)
/**
- * Structure for determining the inode of the file.
- */
-typedef apr_uint64_t apr_ino_t;
-/**
* Structure for determining the device the file is on.
*/
typedef apr_uint32_t apr_dev_t;
#else
-/** The inode of the file. */
-typedef ino_t apr_ino_t;
/**
* Structure for determining the device the file is on.
*/