Get rid of a number of 'incompatible pointer type' warnings using

ap_os_{get,put}_file() on platforms who's ap_os_file_t is not an int.

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

diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index 2192ed16dc0f35ed9c4dfda341d1d91349ef0f4c..a8597b67b9ddb9878b758b3a7f1cf5a3ff427b07 100644 (file)
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -2475,7 +2475,7 @@ static int default_handler(request_rec *r)
            (core_dir_config *)ap_get_module_config(r->per_dir_config, &core_module);
     int rangestatus, errstatus;
     ap_file_t *fd = NULL;
-    int fd_os;
+    ap_os_file_t fd_os;
     ap_status_t status;
 #ifdef USE_MMAP_FILES
     caddr_t mm;

diff --git a/server/config.c b/server/config.c
index b8beb52a30a714e66f0ba78fb890d78a65852cda..1544040ace979ae9485f2632ca51a6215c08b9fb 100644 (file)
--- a/server/config.c
+++ b/server/config.c
@@ -1247,7 +1247,7 @@ static void init_config_globals(ap_context_t *p)
 
 static server_rec *init_server_config(process_rec *process, ap_context_t *p)
 {
-    int errfile = STDERR_FILENO;
+    ap_os_file_t errfile = STDERR_FILENO;
     server_rec *s = (server_rec *) ap_pcalloc(p, sizeof(server_rec));
 
     s->process = process;

diff --git a/server/log.c b/server/log.c
index 831cedf80f15ab6ccaa59f1c43593c876c4b6c97..b0b006f715727638e0d22e40ce8d0b27ff8689ff 100644 (file)
--- a/server/log.c
+++ b/server/log.c
@@ -274,7 +274,7 @@ void ap_open_logs(server_rec *s_main, ap_context_t *p)
 {
     server_rec *virt, *q;
     int replace_stderr;
-    int errfile;
+    ap_os_file_t errfile;
 
     open_error_log(s_main, p);
 
@@ -316,7 +316,7 @@ void ap_open_logs(server_rec *s_main, ap_context_t *p)
 }
 
 API_EXPORT(void) ap_error_log2stderr(server_rec *s) {
-    int errfile;
+    ap_os_file_t errfile;
 
     ap_get_os_file(&errfile, s->error_log);
     if (   s->error_log != NULL
@@ -331,7 +331,7 @@ static void log_error_core(const char *file, int line, int level,
     char errstr[MAX_STRING_LEN + 1];    /* + 1 to have room for '\n' */
     size_t len;
     ap_file_t *logf = NULL;
-    int errfileno = STDERR_FILENO;
+    ap_os_file_t errfileno = STDERR_FILENO;
 
     if (s == NULL) {
        /*