Remaining cleanup of ap_ -> apr_ and AP_ -> APR_ transformation...

  see src/lib/apr/apr_compat.h for most details.
  Also a few minor nits to get Win32 to build.

PR:
Obtained from:
Submitted by:
Reviewed by:


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

10 files changed, 15 insertions, 15 deletions

diff --git a/network_io/beos/poll.c b/network_io/beos/poll.c
index 354de61ce..b6089bee8 100644
--- a/network_io/beos/poll.c
+++ b/network_io/beos/poll.c
@@ -112,8 +112,8 @@ apr_status_t apr_poll(apr_pollfd_t *aprset, apr_int32_t *nsds,
         tvptr = NULL;
     }
     else {
-        tv.tv_sec = timeout / AP_USEC_PER_SEC;
-        tv.tv_usec = timeout % AP_USEC_PER_SEC;
+        tv.tv_sec = timeout / APR_USEC_PER_SEC;
+        tv.tv_usec = timeout % APR_USEC_PER_SEC;
 	tvptr = &tv;
     }
 
diff --git a/network_io/beos/sendrecv.c b/network_io/beos/sendrecv.c
index 601881286..46b489e19 100644
--- a/network_io/beos/sendrecv.c
+++ b/network_io/beos/sendrecv.c
@@ -71,8 +71,8 @@ static apr_status_t wait_for_io_or_timeout(apr_socket_t *sock, int for_read)
             tvptr = NULL;
         }
         else {
-            tv.tv_sec = sock->timeout / AP_USEC_PER_SEC;
-            tv.tv_usec = sock->timeout % AP_USEC_PER_SEC;
+            tv.tv_sec = sock->timeout / APR_USEC_PER_SEC;
+            tv.tv_usec = sock->timeout % APR_USEC_PER_SEC;
             tvptr = &tv;
         }
         srv = select(sock->socketdes + 1,
diff --git a/network_io/beos/sockets.c b/network_io/beos/sockets.c
index 446d8a7d2..5a1347b64 100644
--- a/network_io/beos/sockets.c
+++ b/network_io/beos/sockets.c
@@ -104,7 +104,7 @@ apr_status_t apr_create_tcp_socket(apr_socket_t **new, apr_pool_t *cont)
     return APR_SUCCESS;
 } 
 
-apr_status_t apr_shutdown(apr_socket_t *thesocket, ap_shutdown_how_e how)
+apr_status_t apr_shutdown(apr_socket_t *thesocket, apr_shutdown_how_e how)
 {
     return shutdown(thesocket->socketdes, how);
 }
diff --git a/network_io/os2/poll.c b/network_io/os2/poll.c
index f1bd5826a..3dcf184d0 100644
--- a/network_io/os2/poll.c
+++ b/network_io/os2/poll.c
@@ -134,7 +134,7 @@ apr_status_t apr_poll(apr_pollfd_t *pollfdset, apr_int32_t *nsds,
     time_t starttime;
     struct timeval tv;
 
-    timeout /= AP_USEC_PER_SEC; /* TODO: rework for microseconds and axe this */
+    timeout /= APR_USEC_PER_SEC; /* TODO: rework for microseconds and axe this */
 
     tv.tv_sec = timeout;
     tv.tv_usec = 0;
diff --git a/network_io/os2/sockets.c b/network_io/os2/sockets.c
index b6e417840..12371da48 100644
--- a/network_io/os2/sockets.c
+++ b/network_io/os2/sockets.c
@@ -112,7 +112,7 @@ apr_status_t apr_create_tcp_socket(apr_socket_t **new, apr_pool_t *cont)
     return APR_SUCCESS;
 } 
 
-apr_status_t apr_shutdown(apr_socket_t *thesocket, ap_shutdown_how_e how)
+apr_status_t apr_shutdown(apr_socket_t *thesocket, apr_shutdown_how_e how)
 {
     if (shutdown(thesocket->socketdes, how) == 0) {
         return APR_SUCCESS;
diff --git a/network_io/unix/poll.c b/network_io/unix/poll.c
index 76679791b..b797ccf37 100644
--- a/network_io/unix/poll.c
+++ b/network_io/unix/poll.c
@@ -267,8 +267,8 @@ apr_status_t apr_poll(apr_pollfd_t *aprset, apr_int32_t *nsds,
         tvptr = NULL;
     }
     else {
-        tv.tv_sec = timeout / AP_USEC_PER_SEC;
-        tv.tv_usec = timeout % AP_USEC_PER_SEC;
+        tv.tv_sec = timeout / APR_USEC_PER_SEC;
+        tv.tv_usec = timeout % APR_USEC_PER_SEC;
         tvptr = &tv;
     }
 
diff --git a/network_io/unix/sendrecv.c b/network_io/unix/sendrecv.c
index 2ba230a5c..ad22eb53f 100644
--- a/network_io/unix/sendrecv.c
+++ b/network_io/unix/sendrecv.c
@@ -91,8 +91,8 @@ static apr_status_t wait_for_io_or_timeout(apr_socket_t *sock, int for_read)
             tvptr = NULL;
         }
         else {
-            tv.tv_sec = sock->timeout / AP_USEC_PER_SEC;
-            tv.tv_usec = sock->timeout % AP_USEC_PER_SEC;
+            tv.tv_sec = sock->timeout / APR_USEC_PER_SEC;
+            tv.tv_usec = sock->timeout % APR_USEC_PER_SEC;
             tvptr = &tv;
         }
         srv = select(sock->socketdes + 1,
diff --git a/network_io/unix/sockets.c b/network_io/unix/sockets.c
index 377612f3f..2399c80c6 100644
--- a/network_io/unix/sockets.c
+++ b/network_io/unix/sockets.c
@@ -100,7 +100,7 @@ apr_status_t apr_create_tcp_socket(apr_socket_t **new, apr_pool_t *cont)
     return APR_SUCCESS;
 } 
 
-apr_status_t apr_shutdown(apr_socket_t *thesocket, ap_shutdown_how_e how)
+apr_status_t apr_shutdown(apr_socket_t *thesocket, apr_shutdown_how_e how)
 {
     return (shutdown(thesocket->socketdes, how) == -1) ? errno : APR_SUCCESS;
 }
diff --git a/network_io/win32/poll.c b/network_io/win32/poll.c
index 843a4c5b2..9558f4746 100644
--- a/network_io/win32/poll.c
+++ b/network_io/win32/poll.c
@@ -125,8 +125,8 @@ apr_status_t apr_poll(apr_pollfd_t *aprset, apr_int32_t *nsds,
             tvptr = NULL;
         }
         else {
-            tv.tv_sec = (long)(timeout / AP_USEC_PER_SEC);
-            tv.tv_usec = (long)(timeout % AP_USEC_PER_SEC);
+            tv.tv_sec = (long)(timeout / APR_USEC_PER_SEC);
+            tv.tv_usec = (long)(timeout % APR_USEC_PER_SEC);
             tvptr = &tv;
         }
         rv = select(500, /* ignored on Windows */
diff --git a/network_io/win32/sockets.c b/network_io/win32/sockets.c
index dc6d5f72d..1db683666 100644
--- a/network_io/win32/sockets.c
+++ b/network_io/win32/sockets.c
@@ -113,7 +113,7 @@ apr_status_t apr_create_tcp_socket(apr_socket_t **new, apr_pool_t *cont)
     return APR_SUCCESS;
 } 
 
-apr_status_t apr_shutdown(apr_socket_t *thesocket, ap_shutdown_how_e how)
+apr_status_t apr_shutdown(apr_socket_t *thesocket, apr_shutdown_how_e how)
 {
     int winhow;