summaryrefslogtreecommitdiffstats
path: root/server/scoreboard.c
diff options
context:
space:
mode:
authorBradley Nicholes <bnicholes@apache.org>2002-01-14 23:36:03 +0100
committerBradley Nicholes <bnicholes@apache.org>2002-01-14 23:36:03 +0100
commit4d2424f811b74a292050abc31853785f9917ba50 (patch)
treef3f586aee6d103101e9e6387ff667bdc6d9ffcc3 /server/scoreboard.c
parentChanged the nlm name from APACHE to APACHE2. (diff)
downloadapache2-4d2424f811b74a292050abc31853785f9917ba50.tar.xz
apache2-4d2424f811b74a292050abc31853785f9917ba50.zip
Added APR_HAS_SHARED_MEMORY to a section of code where it was
missing, for those of us that don't have shared memory support. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92854 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/scoreboard.c')
-rw-r--r--server/scoreboard.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/server/scoreboard.c b/server/scoreboard.c
index d196e56403..1365dfccce 100644
--- a/server/scoreboard.c
+++ b/server/scoreboard.c
@@ -230,12 +230,15 @@ apr_status_t ap_cleanup_scoreboard(void *d) {
void ap_create_scoreboard(apr_pool_t *p, ap_scoreboard_e sb_type)
{
int running_gen = 0;
+#if APR_HAS_SHARED_MEMORY
apr_status_t rv;
+#endif
if (ap_scoreboard_image)
running_gen = ap_scoreboard_image->global->running_generation;
if (ap_scoreboard_image == NULL) {
ap_calc_scoreboard_size();
+#if APR_HAS_SHARED_MEMORY
if (sb_type == SB_SHARED) {
void *sb_shared;
rv = open_scoreboard(p);
@@ -253,7 +256,9 @@ void ap_create_scoreboard(apr_pool_t *p, ap_scoreboard_e sb_type)
}
ap_init_scoreboard(sb_shared);
}
- else {
+ else
+#endif
+ {
/* A simple malloc will suffice */
void *sb_mem = calloc(1, scoreboard_size);
if (sb_mem == NULL) {