Two remnants required to make ap_strtol a macro on any platform,

  specifically win32

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

diff --git a/src/ApacheCore.def b/src/ApacheCore.def
index eeecd2a104132e618a21443ab80c6566e0eec108..6e15c7b000bb61858b7873d187a7b562a8d18446 100644 (file)
--- a/src/ApacheCore.def
+++ b/src/ApacheCore.def
@@ -447,4 +447,3 @@ EXPORTS
         ap_getline @439
         ap_get_chunk_size @440
         ap_escape_logitem @441
-        ap_strtol @442

diff --git a/src/include/ap.h b/src/include/ap.h
index 9f21f24d8bf1e4dbd0811c0cd4003709e9b9206d..4eee68b4851682d8c196873bd2197a32db38a7ce 100644 (file)
--- a/src/include/ap.h
+++ b/src/include/ap.h
@@ -74,8 +74,10 @@ int ap_slack(int, int);
 int ap_execle(const char *, const char *, ...);
 int ap_execve(const char *, char * const argv[], char * const envp[]);
 API_EXPORT(int) ap_getpass(const char *prompt, char *pwbuf, size_t bufsiz);
-API_EXPORT(long) ap_strtol(const char *nptr, char **endptr, int base);
 
+#ifndef ap_strtol
+API_EXPORT(long) ap_strtol(const char *nptr, char **endptr, int base);
+#endif
 
 /* small utility macros to make things easier to read */