use pid_t consistantly

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

diff --git a/modules/mappers/mod_watchdog.c b/modules/mappers/mod_watchdog.c
index 4b67f7b1dfca7eed3fe1ab8621c5e9c7cab61546..0692c20b7b5281d4cfd11d0220383a10b9350355 100644 (file)
--- a/modules/mappers/mod_watchdog.c
+++ b/modules/mappers/mod_watchdog.c
@@ -84,7 +84,7 @@ static apr_status_t wd_worker_cleanup(void *data)
 /*--------------------------------------------------------------------------*/
 /*                                                                          */
 /* Main watchdog worker thread.                                             */
-/* For singleton workers child thread theat first obtains the process       */
+/* For singleton workers child thread that first obtains the process       */
 /* mutex is running. Threads in other child's are locked on mutex.          */
 /*                                                                          */
 /*--------------------------------------------------------------------------*/
@@ -127,9 +127,9 @@ static void* APR_THREAD_FUNC wd_worker(apr_thread_t *thread, void *data)
     if (w->is_running) {
         watchdog_list_t *wl = w->callbacks;
         ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, wd_server_conf->s,
-                     "%sWatchdog (%s) running (%d)",
+                     "%sWatchdog (%s) running (%" APR_PID_T_FMT ")",
                      w->singleton ? "Singleton" : "",
-                     w->name, getpid());
+                     w->name, (pid_t)getpid());
         apr_time_clock_hires(w->pool);
         if (wl) {
             apr_pool_t *ctx = NULL;
@@ -212,9 +212,9 @@ static void* APR_THREAD_FUNC wd_worker(apr_thread_t *thread, void *data)
         }
     }
         ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, wd_server_conf->s,
-                     "%sWatchdog (%s) stopping (%d)",
+                     "%sWatchdog (%s) stopping (%" APR_PID_T_FMT ")",
                      w->singleton ? "Singleton" : "",
-                     w->name, getpid());
+                     w->name, (pid_t)getpid());
 
     if (locked)
         apr_proc_mutex_unlock(w->mutex);
@@ -443,7 +443,7 @@ static int wd_post_config_hook(apr_pool_t *pconf, apr_pool_t *plog,
             ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
                 "[%" APR_PID_T_FMT " - %s] "
                 "child second stage post config hook",
-                getpid(), ppid);
+                (pid_t)getpid(), ppid);
             return OK;
         }
     }