From: Guenter Knauf <fuankg@apache.org>
Date: Mon, 29 Nov 2010 18:33:28 +0000 (+0000)
Subject: Fixed some win32 types.
X-Git-Tag: 2.3.10~146
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dbf4a86e3d6f19fdba2e20ea3a04adf8fb7dee10;p=apache

Fixed some win32 types.


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

diff --git a/modules/arch/win32/mod_win32.c b/modules/arch/win32/mod_win32.c
index ae0e87b252..f711f7d50b 100644
--- a/modules/arch/win32/mod_win32.c
+++ b/modules/arch/win32/mod_win32.c
@@ -260,7 +260,7 @@ static apr_array_header_t *split_argv(apr_pool_t *p, const char *interp,
                     break;
                 }
                 ap_unescape_url(w);
-                prep_string(&w, p);
+                prep_string((const char**)&w, p);
                 arg = (const char**)apr_array_push(args);
                 *arg = ap_escape_shell_cmd(p, w);
             }
@@ -353,7 +353,7 @@ static apr_array_header_t *split_argv(apr_pool_t *p, const char *interp,
                 break;
             }
             ap_unescape_url(w);
-            prep_string(&w, p);
+            prep_string((const char**)&w, p);
             arg = (const char**)apr_array_push(args);
             *arg = ap_escape_shell_cmd(p, w);
         }
diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c
index ba52526276..6fc31e8c3e 100644
--- a/server/mpm/winnt/child.c
+++ b/server/mpm/winnt/child.c
@@ -106,8 +106,8 @@ static apr_thread_mutex_t  *child_lock;
 static apr_thread_mutex_t  *qlock;
 static winnt_conn_ctx_t *qhead = NULL;
 static winnt_conn_ctx_t *qtail = NULL;
-static int num_completion_contexts = 0;
-static int max_num_completion_contexts = 0;
+static apr_uint32_t num_completion_contexts = 0;
+static apr_uint32_t max_num_completion_contexts = 0;
 static HANDLE ThreadDispatchIOCP = NULL;
 static HANDLE qwait_event = NULL;
 
@@ -716,7 +716,7 @@ static winnt_conn_ctx_t *winnt_get_connection(winnt_conn_ctx_t *context)
  * Main entry point for the worker threads. Worker threads block in
  * win*_get_connection() awaiting a connection to service.
  */
-static unsigned int __stdcall worker_main(void *thread_num_val)
+static DWORD __stdcall worker_main(void *thread_num_val)
 {
     static int requests_this_child = 0;
     winnt_conn_ctx_t *context = NULL;
@@ -851,7 +851,7 @@ static void cleanup_thread(HANDLE *handles, int *thread_cnt,
  */
 static void create_listener_thread()
 {
-    int tid;
+    unsigned tid;
     int num_listeners = 0;
     /* Start an accept thread per listener
      * XXX: Why would we have a NULL sd in our listeners?
@@ -896,7 +896,7 @@ void child_main(apr_pool_t *pconf)
     int watch_thread;
     int time_remains;
     int cld;
-    int tid;
+    DWORD tid;
     int rv;
     int i;
 
diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index 81e7dee1fd..cb7c22c904 100644
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -616,7 +616,8 @@ static int create_process(apr_pool_t *p, HANDLE *child_proc, HANDLE *child_exit_
     env[envc] = pidbuf;
     env[envc + 1] = NULL;
 
-    rv = apr_proc_create(&new_child, cmd, args, env, attr, ptemp);
+    rv = apr_proc_create(&new_child, cmd, (const char * const *)args,
+                         (const char * const *)env, attr, ptemp);
     if (rv != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_CRIT, rv, ap_server_conf,
                      "Parent: Failed to create the child process.");