first apr_ pass only touched .[ch] files

git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@60472 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 17 insertions, 17 deletions

diff --git a/configure.in b/configure.in
index 863c65fa9..4661d1929 100644
--- a/configure.in
+++ b/configure.in
@@ -355,17 +355,17 @@ fi
 if test "$ac_cv_type_off_t" = "yes"; then
     off_t_value="off_t"
 else
-    off_t_value="ap_int32_t"
+    off_t_value="apr_int32_t"
 fi
 if test "$ac_cv_type_size_t" = "yes"; then
     size_t_value="size_t"
 else
-    size_t_value="ap_int32_t"
+    size_t_value="apr_int32_t"
 fi
 if test "$ac_cv_type_ssize_t" = "yes"; then
     ssize_t_value="ssize_t"
 else
-    ssize_t_value="ap_int32_t"
+    ssize_t_value="apr_int32_t"
 fi
 
 AC_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], ssize_t, 8)
@@ -390,8 +390,8 @@ else
     off_t_fmt='#error Can not determine the proper size for off_t'
 fi
 
-# basically, we have tried to figure out the sizes of ap_ssize_t and
-# ap_off_t, but we don't always get it right.  If you find that we
+# 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.
 case "$OS" in
diff --git a/include/apr.h.in b/include/apr.h.in
index c91c82feb..8f903fd2a 100644
--- a/include/apr.h.in
+++ b/include/apr.h.in
@@ -99,18 +99,18 @@
 
 /* Typedefs that APR needs. */
 
-typedef  @short_value@           ap_int16_t;
-typedef  unsigned @short_value@  ap_uint16_t;
+typedef  @short_value@           apr_int16_t;
+typedef  unsigned @short_value@  apr_uint16_t;
                                                
-typedef  @int_value@             ap_int32_t;
-typedef  unsigned @int_value@    ap_uint32_t;
+typedef  @int_value@             apr_int32_t;
+typedef  unsigned @int_value@    apr_uint32_t;
                                                
-typedef  @long_value@            ap_int64_t;
-typedef  unsigned @long_value@   ap_uint64_t;
+typedef  @long_value@            apr_int64_t;
+typedef  unsigned @long_value@   apr_uint64_t;
 
-typedef  @size_t_value@          ap_size_t;
-typedef  @ssize_t_value@         ap_ssize_t;
-typedef  @off_t_value@           ap_off_t;
+typedef  @size_t_value@          apr_size_t;
+typedef  @ssize_t_value@         apr_ssize_t;
+typedef  @off_t_value@           apr_off_t;
 
 /* Definitions that APR programs need to work properly. */
 
@@ -136,20 +136,20 @@ typedef  @off_t_value@           ap_off_t;
 /* Local machine definition for console and log output. */
 #define APR_EOL_STR              "@eolstr@"
 
-/* Define ap_signal and related necessary definitions.
+/* Define apr_signal and related necessary definitions.
  */
 /* We are checking for HAVE_SIGACTION, but autoconf is filling this in 
  * for us automatically.
  */
 #if @have_sigaction@ && !defined(NO_USE_SIGACTION)
 typedef void Sigfunc(int);
-Sigfunc *ap_signal(int signo, Sigfunc * func);
+Sigfunc *apr_signal(int signo, Sigfunc * func);
 
 #if defined(SIG_ING) && !defined(SIG_ERR)
 #define SIG_ERR ((Sigfunc *)-1)
 #endif
 #else
-#define ap_signal(a,b) signal(a,b)
+#define apr_signal(a,b) signal(a,b)
 #endif
 
 #ifdef APR_HAVE_SYS_WAIT_H