You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by "Victor J. Orlikowski" <vj...@raleigh.ibm.com> on 2000/06/21 18:31:01 UTC

[PATCH] Dexter clean-up (multiply defined symbols....)

Index: src/modules/mpm/dexter/dexter.c
===================================================================
RCS file: /cvs/apache/apache-2.0/src/modules/mpm/dexter/dexter.c,v
retrieving revision 1.98
diff -u -r1.98 dexter.c
--- dexter.c 2000/06/21 13:15:27 1.98
+++ dexter.c 2000/06/21 16:22:57
@@ -99,7 +99,7 @@
 static int max_threads = 0;
 static int max_requests_per_child = 0;
 static const char *ap_pid_fname=NULL;
-API_VAR_EXPORT const char *ap_scoreboard_fname=NULL;
+const char *ap_scoreboard_fname=NULL;
 static int num_daemons=0;
 static int workers_may_exit = 0;
 static int requests_this_child;
Index: src/modules/mpm/dexter/scoreboard.c
===================================================================
RCS file: /cvs/apache/apache-2.0/src/modules/mpm/dexter/scoreboard.c,v
retrieving revision 1.17
diff -u -r1.17 scoreboard.c
--- scoreboard.c 2000/06/19 02:22:28 1.17
+++ scoreboard.c 2000/06/21 16:22:57
@@ -72,7 +72,6 @@
 #endif
 
 static scoreboard *ap_scoreboard_image = NULL;
-API_VAR_EXPORT const char *ap_scoreboard_fname;
 
 /*****************************************************************
  *
Index: src/modules/mpm/dexter/scoreboard.h
===================================================================
RCS file: /cvs/apache/apache-2.0/src/modules/mpm/dexter/scoreboard.h,v
retrieving revision 1.8
diff -u -r1.8 scoreboard.h
--- scoreboard.h 2000/06/10 16:15:01 1.8
+++ scoreboard.h 2000/06/21 16:22:57
@@ -98,6 +98,8 @@
 
 #define SCOREBOARD_SIZE  sizeof(scoreboard)
 
+API_VAR_EXPORT extern const char *ap_scoreboard_fname;
+
 #ifdef __cplusplus
 }
 #endif