You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by Ben Laurie <be...@hyperreal.org> on 1997/07/27 20:44:08 UTC
cvs commit: apache/src Makefile.nt conf.h httpd.h mod_status.c
ben 97/07/27 11:44:07
Modified: src Makefile.nt conf.h httpd.h mod_status.c
Log:
Make mod_status compile under Win32.
Revision Changes Path
1.10 +2 -2 apache/src/Makefile.nt
Index: Makefile.nt
===================================================================
RCS file: /export/home/cvs/apache/src/Makefile.nt,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.nt 1997/07/23 20:09:49 1.9
+++ Makefile.nt 1997/07/27 18:44:04 1.10
@@ -6,7 +6,7 @@
# regex makes delete the appropriate apache.exe. Tacky, but it'll work!
# Ben, 5 July 97
-apacher:
+_apacher:
cd regex & set CFG=regex - Win32 Release& nmake /nologo -f regex.mak
cd . & set CFG=ApacheCore - Win32 Release& nmake /nologo -f ApacheCore.mak
cd . & set CFG=Apache - Win32 Release& nmake /nologo -f Apache.mak
@@ -20,7 +20,7 @@
cd nt & set CFG=ApacheModuleUserTrack - Win32 Release& nmake /nologo -f ApacheModuleUserTrack.mak
cd modules\proxy & set CFG=ApacheModuleProxy - Win32 Release& nmake /nologo -f ApacheModuleProxy.mak
-apached:
+_apached:
cd regex & set CFG=regex - Win32 Debug& nmake /nologo -f regex.mak
cd . & set CFG=ApacheCore - Win32 Debug& nmake /nologo -f ApacheCore.mak
cd . & set CFG=Apache - Win32 Debug& nmake /nologo -f Apache.mak
1.120 +5 -0 apache/src/conf.h
Index: conf.h
===================================================================
RCS file: /export/home/cvs/apache/src/conf.h,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- conf.h 1997/07/27 03:13:30 1.119
+++ conf.h 1997/07/27 18:44:04 1.120
@@ -566,6 +566,11 @@
#define API_EXPORT(type) __declspec(dllexport) type __stdcall
#define API_EXPORT_NONSTD(type) __declspec(dllexport) type
+#ifdef IS_MODULE
+# define API_VAR_EXPORT __declspec(dllimport)
+#else
+# define API_VAR_EXPORT __declspec(dllexport)
+#endif
#define MODULE_VAR_EXPORT __declspec(dllexport)
#define strcasecmp(s1, s2) stricmp(s1, s2)
1.134 +1 -1 apache/src/httpd.h
Index: httpd.h
===================================================================
RCS file: /export/home/cvs/apache/src/httpd.h,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- httpd.h 1997/07/27 02:15:46 1.133
+++ httpd.h 1997/07/27 18:44:05 1.134
@@ -757,7 +757,7 @@
char *get_local_host(pool *);
unsigned long get_virthost_addr (const char *hostname, unsigned short *port);
-extern MODULE_VAR_EXPORT time_t restart_time;
+extern API_VAR_EXPORT time_t restart_time;
/*
* Apache tries to keep all of its long term filehandles (such as log files,
1.57 +2 -0 apache/src/mod_status.c
Index: mod_status.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_status.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- mod_status.c 1997/07/27 01:43:28 1.56
+++ mod_status.c 1997/07/27 18:44:05 1.57
@@ -87,6 +87,8 @@
* 21.5.96 Additional Status codes (DNS and LOGGING only enabled if
extended STATUS is enabled) [George Burgyan/Jim J.] */
+#define IS_MODULE
+
#include "httpd.h"
#include "http_config.h"
#include "http_core.h"