dgaudet 97/07/26 19:15:47
Modified: src http_conf_globals.h httpd.h
Log:
Need extern before MODULE_VAR_EXPORT in order to avoid declaring object
in every file. Some compiler/linkers won't treat these as "common"
style declarations and will complain about multiple-defns.
Revision Changes Path
1.15 +2 -2 apache/src/http_conf_globals.h
Index: http_conf_globals.h
===================================================================
RCS file: /export/home/cvs/apache/src/http_conf_globals.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- http_conf_globals.h 1997/07/15 21:39:51 1.14
+++ http_conf_globals.h 1997/07/27 02:15:45 1.15
@@ -70,13 +70,13 @@
extern int daemons_min_free;
extern int daemons_max_free;
extern int daemons_limit;
-MODULE_VAR_EXPORT int suexec_enabled;
+extern MODULE_VAR_EXPORT int suexec_enabled;
extern int listenbacklog;
extern char *pid_fname;
extern char *scoreboard_fname;
extern char *lock_fname;
-MODULE_VAR_EXPORT char *server_argv0;
+extern MODULE_VAR_EXPORT char *server_argv0;
/* Trying to allocate these in the config pool gets us into some *nasty*
* chicken-and-egg problems in http_main.c --- where do you stick them
1.133 +1 -1 apache/src/httpd.h
Index: httpd.h
===================================================================
RCS file: /export/home/cvs/apache/src/httpd.h,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- httpd.h 1997/07/23 00:09:02 1.132
+++ httpd.h 1997/07/27 02:15:46 1.133
@@ -757,7 +757,7 @@
char *get_local_host(pool *);
unsigned long get_virthost_addr (const char *hostname, unsigned short *port);
-MODULE_VAR_EXPORT time_t restart_time;
+extern MODULE_VAR_EXPORT time_t restart_time;
/*
* Apache tries to keep all of its long term filehandles (such as log files,
