Index: apr/configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.288
diff -u -r1.288 configure.in
--- apr/configure.in	2001/04/09 16:40:19	1.288
+++ apr/configure.in	2001/04/11 15:47:43
@@ -608,20 +608,40 @@
 if test "$ac_cv_sizeof_int" = "4"; then
     int_value=int
 fi
+if test "$ac_cv_sizeof_int" = "8"; then
+    int64_literal='#define APR_INT64_C(val) (val)'
+    int64_t_fmt='#define APR_INT64_T_FMT "d"'
+    int64_value="int"
+fi
 if test "$ac_cv_sizeof_long" = "8"; then
+    int64_literal='#define APR_INT64_C(val) (val##L)'
+    int64_t_fmt='#define APR_INT64_T_FMT "ld"'
+    int64_value="long"
     long_value=long
 fi
 if test "$ac_cv_sizeof_long_double" = "8"; then
+    int64_literal='#define APR_INT64_C(val) (val##LD)'
+    int64_t_fmt='#define APR_INT64_T_FMT "Ld"'
+    int64_value="long double"
     long_value="long double"
 fi
 if test "$ac_cv_sizeof_long_long" = "8"; then
     if test "$ac_cv_sizeof_long_long" = "$ac_cv_sizeof_long"; then
+        int64_literal='#define APR_INT64_C(val) (val##L)'
+        int64_t_fmt='#define APR_INT64_T_FMT "ld"'
+        int64_value="long"
         long_value="long"
     else
+        int64_literal='#define APR_INT64_C(val) (val##LL)'
+        int64_t_fmt='#define APR_INT64_T_FMT "qd"'
+        int64_value="long long"
         long_value="long long"
     fi
 fi
 if test "$ac_cv_sizeof_longlong" = "8"; then
+    int64_literal='#define APR_INT64_C(val) (val##LL)'
+    int64_t_fmt='#define APR_INT64_T_FMT "qd"'
+    int64_value="__int64"
     long_value="__int64"
 fi
 
Index: apr/include/apr.h.in
===================================================================
RCS file: /home/cvs/apr/include/apr.h.in,v
retrieving revision 1.78
diff -u -r1.78 apr.h.in
--- apr/include/apr.h.in	2001/04/05 18:56:07	1.78
+++ apr/include/apr.h.in	2001/04/11 15:47:50
@@ -177,7 +177,7 @@
  * from stdint.h.  we'd probably be doing a Good Thing to check for
  * INT64_C in autoconf... or otherwise define an APR_INT64_C(). -dean
  */
-#define APR_INT64_C(val) (val##LL)
+@int64_literal@
 
 
 /* Definitions that APR programs need to work properly. */
@@ -242,6 +242,11 @@
 
 /* And APR_OS_PROC_T_FMT */
 @os_proc_t_fmt@
+
+/* And APR_INT64_T_FMT */
+
+#define APR_TIME_T_FMT		 APR_INT64_T_FMT
+
 
 /* Local machine definition for console and log output. */
 #define APR_EOL_STR              "@eolstr@"