brane 2003/03/18 15:10:15
Modified: include apr.hw apr.hnw apr.h.in
. configure.in CHANGES
Log:
Define a printf format and format length for apr_uint64_t.
Also define APR_INT64_T_FMT_LEN on Windows and Netware; Unix already
defines that symbol.
Revision Changes Path
1.112 +3 -0 apr/include/apr.hw
Index: apr.hw
===================================================================
RCS file: /home/cvs/apr/include/apr.hw,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- apr.hw 5 Mar 2003 21:22:25 -0000 1.111
+++ apr.hw 18 Mar 2003 23:10:14 -0000 1.112
@@ -490,6 +490,9 @@
#define APR_PID_T_FMT "d"
#define APR_INT64_T_FMT "I64d"
+#define APR_INT64_T_FMT_LEN 4
+#define APR_UINT64_T_FMT "I64u"
+#define APR_UINT64_T_FMT_LEN 4
/* Deal with atoi64 variables ... these should move to apr_private.h */
/* MSVC 7.0 introduced _strtoui64 */
1.32 +3 -0 apr/include/apr.hnw
Index: apr.hnw
===================================================================
RCS file: /home/cvs/apr/include/apr.hnw,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- apr.hnw 5 Mar 2003 21:22:25 -0000 1.31
+++ apr.hnw 18 Mar 2003 23:10:14 -0000 1.32
@@ -357,6 +357,9 @@
#define APR_PATH_MAX PATH_MAX
#define APR_INT64_T_FMT "lld"
+#define APR_INT64_T_FMT_LEN 3
+#define APR_UINT64_T_FMT "llu"
+#define APR_UINT64_T_FMT_LEN 3
#define APR_TIME_T_FMT APR_INT64_T_FMT
/* Deal with atoi64 variables ... these should move to apr_private.h */
1.121 +4 -0 apr/include/apr.h.in
Index: apr.h.in
===================================================================
RCS file: /home/cvs/apr/include/apr.h.in,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- apr.h.in 5 Mar 2003 21:22:25 -0000 1.120
+++ apr.h.in 18 Mar 2003 23:10:14 -0000 1.121
@@ -390,6 +390,10 @@
@int64_t_fmt@
@int64_t_fmt_len@
+/* And APR_UINT64_T_FMT */
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
+
/* Deal with atoi64 variables ... these should move to apr_private.h */
#define APR_HAVE_INT64_STRFN @have_int64_strfn@
#define APR_INT64_STRFN @int64_strfn@
1.519 +14 -0 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.518
retrieving revision 1.519
diff -u -r1.518 -r1.519
--- configure.in 10 Mar 2003 09:50:38 -0000 1.518
+++ configure.in 18 Mar 2003 23:10:14 -0000 1.519
@@ -1071,6 +1071,8 @@
int64_literal='#define APR_INT64_C(val) (val)'
int64_t_fmt='#define APR_INT64_T_FMT "d"'
int64_t_fmt_len='#define APR_INT64_T_FMT_LEN 1'
+ uint64_t_fmt='#define APR_UINT64_T_FMT "u"'
+ uint64_t_fmt_len='#define APR_UINT64_T_FMT_LEN 1'
int64_value="int"
long_value=int
int64_strfn="strtoi"
@@ -1078,6 +1080,8 @@
int64_literal='#define APR_INT64_C(val) (val##L)'
int64_t_fmt='#define APR_INT64_T_FMT "ld"'
int64_t_fmt_len='#define APR_INT64_T_FMT_LEN 2'
+ uint64_t_fmt='#define APR_UINT64_T_FMT "lu"'
+ uint64_t_fmt_len='#define APR_UINT64_T_FMT_LEN 2'
int64_value="long"
long_value=long
int64_strfn="strtol"
@@ -1089,6 +1093,8 @@
# go to the OS-dependent section.
int64_t_fmt='#define APR_INT64_T_FMT "lld"'
int64_t_fmt_len='#define APR_INT64_T_FMT_LEN 3'
+ uint64_t_fmt='#define APR_UINT64_T_FMT "llu"'
+ uint64_t_fmt_len='#define APR_UINT64_T_FMT_LEN 3'
int64_value="long long"
long_value="long long"
int64_strfn="strtoll"
@@ -1096,6 +1102,8 @@
int64_literal='#define APR_INT64_C(val) (val##LD)'
int64_t_fmt='#define APR_INT64_T_FMT "Ld"'
int64_t_fmt_len='#define APR_INT64_T_FMT_LEN 2'
+ uint64_t_fmt='#define APR_UINT64_T_FMT "Lu"'
+ uint64_t_fmt_len='#define APR_UINT64_T_FMT_LEN 2'
int64_value="long double"
long_value="long double"
int64_strfn="strtoll"
@@ -1103,6 +1111,8 @@
int64_literal='#define APR_INT64_C(val) (val##LL)'
int64_t_fmt='#define APR_INT64_T_FMT "qd"'
int64_t_fmt_len='#define APR_INT64_T_FMT_LEN 2'
+ uint64_t_fmt='#define APR_UINT64_T_FMT "qu"'
+ uint64_t_fmt_len='#define APR_UINT64_T_FMT_LEN 2'
int64_value="__int64"
long_value="__int64"
int64_strfn="strtoll"
@@ -1112,6 +1122,8 @@
int64_literal='#error Can not determine the proper size for apr_int64_t'
int64_t_fmt='#error Can not determine the proper size for apr_int64_t'
int64_t_fmt_len='#error Can not determine the proper size for
apr_int64_t'
+ uint64_t_fmt='#error Can not determine the proper size for apr_int64_t'
+ uint64_t_fmt_len='#error Can not determine the proper size for
apr_int64_t'
fi
# If present, allow the C99 macro INT64_C to override our conversion.
@@ -1250,6 +1262,8 @@
AC_SUBST(socklen_t_value)
AC_SUBST(int64_t_fmt)
AC_SUBST(int64_t_fmt_len)
+AC_SUBST(uint64_t_fmt)
+AC_SUBST(uint64_t_fmt_len)
AC_SUBST(ssize_t_fmt)
AC_SUBST(size_t_fmt)
AC_SUBST(off_t_fmt)
1.387 +3 -0 apr/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr/CHANGES,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -r1.386 -r1.387
--- CHANGES 10 Mar 2003 21:07:01 -0000 1.386
+++ CHANGES 18 Mar 2003 23:10:14 -0000 1.387
@@ -1,5 +1,8 @@
Changes with APR 0.9.2
+ *) Define APR_UINT64_T_FMT and APR_UINT64_T_FMT_LEN.
+ Define APR_INT64_T_FMT_LEN on Windows and Netware. [Branko Cibej]
+
*) Correct apr_file_gets() on OS2 and Win32 so that '\r's are no longer
eaten, and apr_file_gets() -> apr_file_puts() moves the contents
uncorrupted. [William Rowe]
