From 6d788a6303f6f04b863eb87aa05d2741a4157029 Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Tue, 6 Feb 2001 22:22:59 +0000 Subject: [PATCH] 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 --- include/scoreboard.h | 2 ++ server/mpm/mpmt_pthread/mpm.h | 1 - server/mpm/prefork/mpm.h | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/scoreboard.h b/include/scoreboard.h index f855264d0c..cbb67dd147 100644 --- 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 3dc5187e72..b9a1d95b20 100644 --- 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 ed1f96175b..e6349ece33 100644 --- 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]; -- 2.40.0