httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Victor J. Orlikowski" <...@raleigh.ibm.com>
Subject [PATCH] mpmt_pthread clean-up (multiply defined symbols)
Date Wed, 21 Jun 2000 16:31:34 GMT
Index: src/modules/mpm/mpmt_pthread/mpmt_pthread.c
===================================================================
RCS file:
/cvs/apache/apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c,v
retrieving revision 1.92
diff -u -r1.92 mpmt_pthread.c
--- mpmt_pthread.c 2000/06/21 13:15:28 1.92
+++ mpmt_pthread.c 2000/06/21 16:22:58
@@ -94,7 +94,7 @@
 int ap_threads_per_child=0;         /* Worker threads per child */
 int ap_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 ap_daemons_to_start=0;
 static int min_spare_threads=0;
 static int max_spare_threads=0;
Index: src/modules/mpm/mpmt_pthread/scoreboard.c
===================================================================
RCS file: /cvs/apache/apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.c,v
retrieving revision 1.34
diff -u -r1.34 scoreboard.c
--- scoreboard.c 2000/06/19 02:22:30 1.34
+++ scoreboard.c 2000/06/21 16:22:58
@@ -75,7 +75,6 @@
 scoreboard *ap_scoreboard_image = NULL;
 new_scoreboard *ap_new_scoreboard_image = NULL;
 static int maintain_connection_status = 1;
-API_VAR_EXPORT const char *ap_scoreboard_fname;
 /*****************************************************************
  *
  * Dealing with the scoreboard... a lot of these variables are global
Index: src/modules/mpm/mpmt_pthread/scoreboard.h
===================================================================
RCS file: /cvs/apache/apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.h,v
retrieving revision 1.18
diff -u -r1.18 scoreboard.h
--- scoreboard.h 2000/06/10 16:15:03 1.18
+++ scoreboard.h 2000/06/21 16:22:58
@@ -226,7 +226,7 @@


 API_VAR_EXPORT extern scoreboard *ap_scoreboard_image;
-
+API_VAR_EXPORT extern const char *ap_scoreboard_fname;
 API_VAR_EXPORT extern ap_generation_t volatile ap_my_generation;

 /* for time_process_request() in http_main.c */
@@ -235,6 +235,6 @@

 #ifdef __cplusplus
 }
-#endif

+#endif
 #endif /* !APACHE_SCOREBOARD_H */



Mime
View raw message