Well the wrappers work out well... nice to be able to put off committing

  these API changes until the evening ;)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95587 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/cache/mod_file_cache.c b/modules/cache/mod_file_cache.c
index 0a58de0517669a128bd823f0e434a24772fbf9aa..646d77bf0b41c542e69a9134491fc0a298098c52 100644 (file)
--- a/modules/cache/mod_file_cache.c
+++ b/modules/cache/mod_file_cache.c
@@ -226,7 +226,7 @@ static void cache_the_file(cmd_parms *cmd, const char *filename, int mmap)
                      "mod_file_cache: unable to open(%s, O_RDONLY), skipping", fspec);
        return;
     }
-    apr_file_set_inherit(fd);
+    apr_file_inherit_set(fd);
 
     /* WooHoo, we have a file to put in the cache */
     new_file = apr_pcalloc(cmd->pool, sizeof(a_file));

diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c
index e8276404ef72379ac02fff7c60ccb6620644070a..44111cdbf86debba53b65ce967b62e46404f0f40 100644 (file)
--- a/modules/loggers/mod_log_config.c
+++ b/modules/loggers/mod_log_config.c
@@ -1111,7 +1111,7 @@ static config_log_state *open_config_log(server_rec *s, apr_pool_t *p,
                          "could not open transfer log file %s.", fname);
             exit(1);
         }
-        apr_file_set_inherit(cls->log_fd);
+        apr_file_inherit_set(cls->log_fd);
     }
 #ifdef BUFFERED_LOGS
     cls->outcnt = 0;

diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index ee628626cf88a7df3c3ecfd770c132c4ec11b5ab..4061e78612e00c5f25615996fe9ccc45304508f5 100644 (file)
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -3183,7 +3183,7 @@ static void open_rewritelog(server_rec *s, apr_pool_t *p)
                          "file %s", fname);
             exit(1);
         }
-        apr_file_set_inherit(conf->rewritelogfp);
+        apr_file_inherit_set(conf->rewritelogfp);
     }
     return;
 }

diff --git a/server/log.c b/server/log.c
index 19647a1832f98d1c22831441b543bdd9613c0b66..091f8fcfa44e6a07001ec239357cbe46eabcb31e 100644 (file)
--- a/server/log.c
+++ b/server/log.c
@@ -312,7 +312,7 @@ static void open_error_log(server_rec *s, apr_pool_t *p)
             exit(1);
         }
 
-        apr_file_set_inherit(s->error_log);
+        apr_file_inherit_set(s->error_log);
     }
 }
 

diff --git a/server/mpm_common.c b/server/mpm_common.c
index bfe7c755d34f15700858e37a1f187893c2740df1..98f482dd63c129f8e2fa8286d1b4f06a082ed172 100644 (file)
--- a/server/mpm_common.c
+++ b/server/mpm_common.c
@@ -244,7 +244,7 @@ void ap_wait_or_timeout(apr_exit_why_e *status, int *exitcode, apr_proc_t *ret,
 int ap_process_child_status(apr_proc_t *pid, apr_exit_why_e why, int status)
 {
     int signum = status;
-    const char *sigdesc = apr_signal_get_description(signum);
+    const char *sigdesc = apr_signal_description_get(signum);
 
     /* Child died... if it died due to a fatal error,
      * we should simply bail out.  The caller needs to