diff options
| author | Jim Jagielski <jim@apache.org> | 2013-06-18 12:50:05 +0000 |
|---|---|---|
| committer | Jim Jagielski <jim@apache.org> | 2013-06-18 12:50:05 +0000 |
| commit | 49fa90ea9ad002f3420f515aba4cf41565060357 (patch) | |
| tree | 21c9f7de6fd2bbf658df9a9162d0f93441d02267 /include | |
| parent | 7564d5de31e90c102ca6512943dd1fcd616a8fb4 (diff) | |
| download | httpd-49fa90ea9ad002f3420f515aba4cf41565060357.tar.gz | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/ap_mmn.h | 3 | ||||
| -rw-r--r-- | include/httpd.h | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/include/ap_mmn.h b/include/ap_mmn.h index 4c08be80b8..319c72a2c7 100644 --- 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 9bc8be6e52..3b87e49cf8 100644 --- 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 |