get Unix MPMs to build again after recent scoreboard changes

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

diff --git a/include/scoreboard.h b/include/scoreboard.h
index f855264d0c60dd7ac65277c60661b29d8b339801..cbb67dd147feec239b0054c656c8e98c27e6b1d5 100644 (file)
--- a/include/scoreboard.h
+++ b/include/scoreboard.h
@@ -156,7 +156,9 @@ typedef struct {
     unsigned short timeout_len;        /* length of the timeout */
 #endif
     int thread_num;
+#if APR_HAS_THREADS
     apr_os_thread_t tid;
+#endif
     unsigned char status;
     unsigned long access_count;
     unsigned long bytes_served;

diff --git a/server/mpm/mpmt_pthread/mpm.h b/server/mpm/mpmt_pthread/mpm.h
index 3dc5187e72c18b46551625f2934813a857aee7cb..b9a1d95b20b6d4579bc3d3d1bd526f21659b16a7 100644 (file)
--- a/server/mpm/mpmt_pthread/mpm.h
+++ b/server/mpm/mpmt_pthread/mpm.h
@@ -73,7 +73,6 @@ extern int ap_max_requests_per_child;
 extern int ap_max_daemons_limit;
 extern unsigned int ap_my_pid;
 extern server_rec *ap_server_conf;
-extern scoreboard *ap_scoreboard_image;
 extern char ap_coredump_dir[MAX_STRING_LEN];
 
 #endif /* APACHE_MPM_MPMT_PTHREAD_H */

diff --git a/server/mpm/prefork/mpm.h b/server/mpm/prefork/mpm.h
index ed1f96175b1bdb75b804d4307cf7ba9e83972850..e6349ece33e4f1c425cb771b9548b0125a3f48b6 100644 (file)
--- a/server/mpm/prefork/mpm.h
+++ b/server/mpm/prefork/mpm.h
@@ -73,7 +73,6 @@
 
 extern int ap_threads_per_child;
 extern int ap_max_daemons_limit;
-extern scoreboard *ap_scoreboard_image;
 extern server_rec *ap_server_conf;
 extern int ap_my_pid;
 extern char ap_coredump_dir[MAX_STRING_LEN];