Merge r1491155 from trunk:

Allow use of strtoul()

It conforms to C89 and we don't support older compilers than that.

PR: 55077

Submitted by: sf
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1494121 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index de3776302151fa06a89643962f3c80e15803adde..a676618c42ea4329581280f12b7deddf5c1e3a10 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -90,10 +90,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
  
-    * core: Allow strtoul
-      trunk patch: http://svn.apache.org/r1491155
-      2.4.x patch: http://people.apache.org/~sf/PR55077.diff
-      +1: sf, jim, trawick
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 4c08be80b8957a7b5abb1bb8c97ed292f9b50d07..319c72a2c76510a7469dfa2798d449114c7a3400 100644 (file)
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -416,6 +416,7 @@
  * 20120211.20 (2.4.5-dev) Add dirwalk_stat hook.
  * 20120211.21 (2.4.5-dev) Add in ap_proxy_create_hdrbrgd() and
  *                         ap_proxy_pass_brigade()
+ * 20120211.22 (2.4.5-dev) No longer prevent usage of strtoul()
  */
 
 #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
@@ -423,7 +424,7 @@
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
 #define MODULE_MAGIC_NUMBER_MAJOR 20120211
 #endif
-#define MODULE_MAGIC_NUMBER_MINOR 21                   /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 22                   /* 0...n */
 
 /**
  * Determine if the server's current MODULE_MAGIC_NUMBER is at least a

diff --git a/include/httpd.h b/include/httpd.h
index 9bc8be6e5260f88ebbaa031c6a008304d6870276..3b87e49cf880f2be39ae31bf297d828e85750c96 100644 (file)
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -2111,12 +2111,6 @@ extern int raise_sigstop_flags;
  */
 AP_DECLARE(const char *) ap_psignature(const char *prefix, request_rec *r);
 
-/** strtoul does not exist on sunos4. */
-#ifdef strtoul
-#undef strtoul
-#endif
-#define strtoul strtoul_is_not_a_portable_function_use_strtol_instead
-
   /* The C library has functions that allow const to be silently dropped ...
      these macros detect the drop in maintainer mode, but use the native
      methods for normal builds