ben 97/07/15 15:37:00
Modified: src .cvsignore ApacheCore.mak conf.h http_core.c
http_core.h http_protocol.c mod_asis.c mod_auth.c
mod_autoindex.c util.c
src/nt readdir.c readdir.h
Added: src/nt .cvsignore ApacheModuleAsis.mak
ApacheModuleAuth.mak ApacheModuleAutoIndex.mak
Log:
More Win32 DLLification.
Revision Changes Path
1.5 +4 -2 apache/src/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /export/home/cvs/apache/src/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -C3 -r1.4 -r1.5
*** .cvsignore 1997/07/05 22:09:28 1.4
--- .cvsignore 1997/07/15 22:36:49 1.5
***************
*** 3,9 ****
modules.c
httpd
Makefile.config
! apache.mdp
! apache.ncb
Release
Debug
--- 3,11 ----
modules.c
httpd
Makefile.config
! *.mdp
! *.ncb
Release
Debug
+ CoreD
+ LaunchD
1.2 +50 -134 apache/src/ApacheCore.mak
Index: ApacheCore.mak
===================================================================
RCS file: /export/home/cvs/apache/src/ApacheCore.mak,v
retrieving revision 1.1
retrieving revision 1.2
diff -C3 -r1.1 -r1.2
*** ApacheCore.mak 1997/07/13 19:01:05 1.1
--- ApacheCore.mak 1997/07/15 22:36:49 1.2
***************
*** 346,353 ****
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_HTTP_=\
- ".\alloc.h"\
- ".\buff.h"\
".\conf.h"\
".\explain.h"\
".\http_conf_globals.h"\
--- 346,351 ----
***************
*** 360,374 ****
".\httpd.h"\
".\multithread.h"\
".\nt\getopt.h"\
- ".\nt\readdir.h"\
".\nt\service.h"\
".\scoreboard.h"\
{$(INCLUDE)}"\sys\STAT.H"\
{$(INCLUDE)}"\sys\TYPES.H"\
- NODEP_CPP_HTTP_=\
- ".\sfio.h"\
-
"$(INTDIR)\http_main.obj" : $(SOURCE) $(DEP_CPP_HTTP_) "$(INTDIR)"
--- 358,368 ----
***************
*** 397,405 ****
{$(INCLUDE)}"\sys\STAT.H"\
{$(INCLUDE)}"\sys\TYPES.H"\
- NODEP_CPP_HTTP_=\
- ".\sfio.h"\
-
"$(INTDIR)\http_main.obj" : $(SOURCE) $(DEP_CPP_HTTP_) "$(INTDIR)"
--- 391,396 ----
***************
*** 445,453 ****
{$(INCLUDE)}"\sys\STAT.H"\
{$(INCLUDE)}"\sys\TYPES.H"\
- NODEP_CPP_BUFF_=\
- ".\sfio.h"\
-
"$(INTDIR)\buff.obj" : $(SOURCE) $(DEP_CPP_BUFF_) "$(INTDIR)"
--- 436,441 ----
***************
*** 461,501 ****
# Begin Source File
SOURCE=.\alloc.c
-
- !IF "$(CFG)" == "ApacheCore - Win32 Release"
-
DEP_CPP_ALLOC=\
- ".\alloc.h"\
- ".\buff.h"\
".\conf.h"\
".\httpd.h"\
".\multithread.h"\
! ".\nt\readdir.h"\
{$(INCLUDE)}"\sys\TYPES.H"\
! NODEP_CPP_ALLOC=\
! ".\sfio.h"\
!
"$(INTDIR)\alloc.obj" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)"
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
- DEP_CPP_ALLOC=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\httpd.h"\
- ".\multithread.h"\
- ".\nt\readdir.h"\
- ".\regex\regex.h"\
- {$(INCLUDE)}"\sys\STAT.H"\
- {$(INCLUDE)}"\sys\TYPES.H"\
-
- NODEP_CPP_ALLOC=\
- ".\sfio.h"\
-
"$(INTDIR)\alloc.obj" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)"
--- 449,471 ----
# Begin Source File
SOURCE=.\alloc.c
DEP_CPP_ALLOC=\
".\conf.h"\
".\httpd.h"\
".\multithread.h"\
! ".\regex\regex.h"\
! {$(INCLUDE)}"\sys\STAT.H"\
{$(INCLUDE)}"\sys\TYPES.H"\
!
! !IF "$(CFG)" == "ApacheCore - Win32 Release"
!
"$(INTDIR)\alloc.obj" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)"
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
"$(INTDIR)\alloc.obj" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)"
***************
*** 545,553 ****
{$(INCLUDE)}"\sys\STAT.H"\
{$(INCLUDE)}"\sys\TYPES.H"\
- NODEP_CPP_HTTP_L=\
- ".\sfio.h"\
-
"$(INTDIR)\http_log.obj" : $(SOURCE) $(DEP_CPP_HTTP_L) "$(INTDIR)"
--- 515,520 ----
***************
*** 561,566 ****
--- 528,536 ----
# Begin Source File
SOURCE=.\http_config.c
+
+ !IF "$(CFG)" == "ApacheCore - Win32 Release"
+
DEP_CPP_HTTP_C=\
".\alloc.h"\
".\buff.h"\
***************
*** 581,594 ****
".\sfio.h"\
- !IF "$(CFG)" == "ApacheCore - Win32 Release"
-
-
"$(INTDIR)\http_config.obj" : $(SOURCE) $(DEP_CPP_HTTP_C) "$(INTDIR)"
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
"$(INTDIR)\http_config.obj" : $(SOURCE) $(DEP_CPP_HTTP_C) "$(INTDIR)"
--- 551,577 ----
".\sfio.h"\
"$(INTDIR)\http_config.obj" : $(SOURCE) $(DEP_CPP_HTTP_C) "$(INTDIR)"
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
+ DEP_CPP_HTTP_C=\
+ ".\alloc.h"\
+ ".\buff.h"\
+ ".\conf.h"\
+ ".\explain.h"\
+ ".\http_conf_globals.h"\
+ ".\http_config.h"\
+ ".\http_core.h"\
+ ".\http_log.h"\
+ ".\http_request.h"\
+ ".\httpd.h"\
+ ".\nt\readdir.h"\
+ ".\regex\regex.h"\
+ {$(INCLUDE)}"\sys\STAT.H"\
+ {$(INCLUDE)}"\sys\TYPES.H"\
+
"$(INTDIR)\http_config.obj" : $(SOURCE) $(DEP_CPP_HTTP_C) "$(INTDIR)"
***************
*** 630,641 ****
# Begin Source File
SOURCE=.\http_core.c
-
- !IF "$(CFG)" == "ApacheCore - Win32 Release"
-
DEP_CPP_HTTP_CO=\
- ".\alloc.h"\
- ".\buff.h"\
".\conf.h"\
".\http_conf_globals.h"\
".\http_config.h"\
--- 613,619 ----
***************
*** 645,651 ****
".\http_protocol.h"\
".\httpd.h"\
".\md5.h"\
- ".\nt\readdir.h"\
".\regex\regex.h"\
".\rfc1413.h"\
".\scoreboard.h"\
--- 623,628 ----
***************
*** 653,690 ****
{$(INCLUDE)}"\sys\STAT.H"\
{$(INCLUDE)}"\sys\TYPES.H"\
! NODEP_CPP_HTTP_CO=\
! ".\sfio.h"\
!
"$(INTDIR)\http_core.obj" : $(SOURCE) $(DEP_CPP_HTTP_CO) "$(INTDIR)"
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
- DEP_CPP_HTTP_CO=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_conf_globals.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\http_main.h"\
- ".\http_protocol.h"\
- ".\httpd.h"\
- ".\md5.h"\
- ".\nt\readdir.h"\
- ".\regex\regex.h"\
- ".\rfc1413.h"\
- ".\scoreboard.h"\
- ".\util_md5.h"\
- {$(INCLUDE)}"\sys\STAT.H"\
- {$(INCLUDE)}"\sys\TYPES.H"\
-
- NODEP_CPP_HTTP_CO=\
- ".\sfio.h"\
-
"$(INTDIR)\http_core.obj" : $(SOURCE) $(DEP_CPP_HTTP_CO) "$(INTDIR)"
--- 630,644 ----
{$(INCLUDE)}"\sys\STAT.H"\
{$(INCLUDE)}"\sys\TYPES.H"\
!
! !IF "$(CFG)" == "ApacheCore - Win32 Release"
!
"$(INTDIR)\http_core.obj" : $(SOURCE) $(DEP_CPP_HTTP_CO) "$(INTDIR)"
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
"$(INTDIR)\http_core.obj" : $(SOURCE) $(DEP_CPP_HTTP_CO) "$(INTDIR)"
***************
*** 781,789 ****
# Begin Source File
SOURCE=.\http_protocol.c
-
- !IF "$(CFG)" == "ApacheCore - Win32 Release"
-
DEP_CPP_HTTP_P=\
".\alloc.h"\
".\buff.h"\
--- 735,740 ----
***************
*** 802,831 ****
".\sfio.h"\
"$(INTDIR)\http_protocol.obj" : $(SOURCE) $(DEP_CPP_HTTP_P) "$(INTDIR)"
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
- DEP_CPP_HTTP_P=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\http_main.h"\
- ".\http_protocol.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
- ".\regex\regex.h"\
- ".\util_date.h"\
- {$(INCLUDE)}"\sys\STAT.H"\
- {$(INCLUDE)}"\sys\TYPES.H"\
-
- NODEP_CPP_HTTP_P=\
- ".\sfio.h"\
-
"$(INTDIR)\http_protocol.obj" : $(SOURCE) $(DEP_CPP_HTTP_P) "$(INTDIR)"
--- 753,766 ----
".\sfio.h"\
+ !IF "$(CFG)" == "ApacheCore - Win32 Release"
+
+
"$(INTDIR)\http_protocol.obj" : $(SOURCE) $(DEP_CPP_HTTP_P) "$(INTDIR)"
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
"$(INTDIR)\http_protocol.obj" : $(SOURCE) $(DEP_CPP_HTTP_P) "$(INTDIR)"
***************
*** 843,848 ****
--- 778,785 ----
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_HTTP_R=\
+ ".\alloc.h"\
+ ".\buff.h"\
".\conf.h"\
".\http_config.h"\
".\http_core.h"\
***************
*** 851,857 ****
--- 788,799 ----
".\http_protocol.h"\
".\http_request.h"\
".\httpd.h"\
+ ".\nt\readdir.h"\
".\scoreboard.h"\
+ {$(INCLUDE)}"\sys\TYPES.H"\
+
+ NODEP_CPP_HTTP_R=\
+ ".\sfio.h"\
"$(INTDIR)\http_request.obj" : $(SOURCE) $(DEP_CPP_HTTP_R) "$(INTDIR)"
***************
*** 1021,1032 ****
".\http_main.h"\
".\httpd.h"\
".\nt\readdir.h"\
".\rfc1413.h"\
{$(INCLUDE)}"\sys\TYPES.H"\
- NODEP_CPP_RFC14=\
- ".\sfio.h"\
-
"$(INTDIR)\rfc1413.obj" : $(SOURCE) $(DEP_CPP_RFC14) "$(INTDIR)"
--- 963,973 ----
".\http_main.h"\
".\httpd.h"\
".\nt\readdir.h"\
+ ".\regex\regex.h"\
".\rfc1413.h"\
+ {$(INCLUDE)}"\sys\STAT.H"\
{$(INCLUDE)}"\sys\TYPES.H"\
"$(INTDIR)\rfc1413.obj" : $(SOURCE) $(DEP_CPP_RFC14) "$(INTDIR)"
***************
*** 1096,1107 ****
".\httpd.h"\
".\md5.h"\
".\nt\readdir.h"\
".\util_md5.h"\
{$(INCLUDE)}"\sys\TYPES.H"\
- NODEP_CPP_UTIL_M=\
- ".\sfio.h"\
-
"$(INTDIR)\util_md5.obj" : $(SOURCE) $(DEP_CPP_UTIL_M) "$(INTDIR)"
--- 1037,1047 ----
".\httpd.h"\
".\md5.h"\
".\nt\readdir.h"\
+ ".\regex\regex.h"\
".\util_md5.h"\
+ {$(INCLUDE)}"\sys\STAT.H"\
{$(INCLUDE)}"\sys\TYPES.H"\
"$(INTDIR)\util_md5.obj" : $(SOURCE) $(DEP_CPP_UTIL_M) "$(INTDIR)"
***************
*** 1169,1179 ****
".\conf.h"\
".\httpd.h"\
".\nt\readdir.h"\
{$(INCLUDE)}"\sys\TYPES.H"\
- NODEP_CPP_HTTP_B=\
- ".\sfio.h"\
-
"$(INTDIR)\http_bprintf.obj" : $(SOURCE) $(DEP_CPP_HTTP_B) "$(INTDIR)"
--- 1109,1118 ----
".\conf.h"\
".\httpd.h"\
".\nt\readdir.h"\
+ ".\regex\regex.h"\
+ {$(INCLUDE)}"\sys\STAT.H"\
{$(INCLUDE)}"\sys\TYPES.H"\
"$(INTDIR)\http_bprintf.obj" : $(SOURCE) $(DEP_CPP_HTTP_B) "$(INTDIR)"
***************
*** 1218,1228 ****
".\http_config.h"\
".\httpd.h"\
".\nt\readdir.h"\
{$(INCLUDE)}"\sys\TYPES.H"\
- NODEP_CPP_MODUL=\
- ".\sfio.h"\
-
BuildCmds= \
$(CPP) $(CPP_PROJ) $(SOURCE) \
--- 1157,1166 ----
".\http_config.h"\
".\httpd.h"\
".\nt\readdir.h"\
+ ".\regex\regex.h"\
+ {$(INCLUDE)}"\sys\STAT.H"\
{$(INCLUDE)}"\sys\TYPES.H"\
BuildCmds= \
$(CPP) $(CPP_PROJ) $(SOURCE) \
***************
*** 1272,1282 ****
".\http_config.h"\
".\httpd.h"\
".\nt\readdir.h"\
{$(INCLUDE)}"\sys\TYPES.H"\
- NODEP_CPP_MOD_D=\
- ".\sfio.h"\
-
BuildCmds= \
$(CPP) $(CPP_PROJ) $(SOURCE) \
--- 1210,1219 ----
".\http_config.h"\
".\httpd.h"\
".\nt\readdir.h"\
+ ".\regex\regex.h"\
+ {$(INCLUDE)}"\sys\STAT.H"\
{$(INCLUDE)}"\sys\TYPES.H"\
BuildCmds= \
$(CPP) $(CPP_PROJ) $(SOURCE) \
***************
*** 1320,1328 ****
# Begin Source File
SOURCE=.\util_script.c
-
- !IF "$(CFG)" == "ApacheCore - Win32 Release"
-
DEP_CPP_UTIL_S=\
".\alloc.h"\
".\buff.h"\
--- 1257,1262 ----
***************
*** 1343,1374 ****
".\sfio.h"\
"$(INTDIR)\util_script.obj" : $(SOURCE) $(DEP_CPP_UTIL_S) "$(INTDIR)"
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
- DEP_CPP_UTIL_S=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_conf_globals.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\http_main.h"\
- ".\http_protocol.h"\
- ".\http_request.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
- ".\regex\regex.h"\
- ".\util_script.h"\
- {$(INCLUDE)}"\sys\STAT.H"\
- {$(INCLUDE)}"\sys\TYPES.H"\
-
- NODEP_CPP_UTIL_S=\
- ".\sfio.h"\
-
"$(INTDIR)\util_script.obj" : $(SOURCE) $(DEP_CPP_UTIL_S) "$(INTDIR)"
--- 1277,1290 ----
".\sfio.h"\
+ !IF "$(CFG)" == "ApacheCore - Win32 Release"
+
+
"$(INTDIR)\util_script.obj" : $(SOURCE) $(DEP_CPP_UTIL_S) "$(INTDIR)"
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
"$(INTDIR)\util_script.obj" : $(SOURCE) $(DEP_CPP_UTIL_S) "$(INTDIR)"
1.114 +1 -1 apache/src/conf.h
Index: conf.h
===================================================================
RCS file: /export/home/cvs/apache/src/conf.h,v
retrieving revision 1.113
retrieving revision 1.114
diff -C3 -r1.113 -r1.114
*** conf.h 1997/07/13 19:01:09 1.113
--- conf.h 1997/07/15 22:36:49 1.114
***************
*** 633,639 ****
#define ap_snprintf snprintf
#define ap_vsnprintf vsnprintf
#else
! int ap_snprintf(char *buf, size_t len, const char *format,...);
int ap_vsnprintf(char *buf, size_t len, const char *format, va_list ap);
#endif
--- 633,639 ----
#define ap_snprintf snprintf
#define ap_vsnprintf vsnprintf
#else
! API_EXPORT(int) ap_snprintf(char *buf, size_t len, const char *format,...);
int ap_vsnprintf(char *buf, size_t len, const char *format, va_list ap);
#endif
1.95 +1 -1 apache/src/http_core.c
Index: http_core.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_core.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -C3 -r1.94 -r1.95
*** http_core.c 1997/07/13 19:01:10 1.94
--- http_core.c 1997/07/15 22:36:50 1.95
***************
*** 292,298 ****
return conf->document_root;
}
! array_header *requires (request_rec *r)
{
core_dir_config *conf =
(core_dir_config *)get_module_config(r->per_dir_config,
&core_module);
--- 292,298 ----
return conf->document_root;
}
! API_EXPORT(array_header *) requires (request_rec *r)
{
core_dir_config *conf =
(core_dir_config *)get_module_config(r->per_dir_config,
&core_module);
1.23 +1 -1 apache/src/http_core.h
Index: http_core.h
===================================================================
RCS file: /export/home/cvs/apache/src/http_core.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C3 -r1.22 -r1.23
*** http_core.h 1997/07/13 19:01:10 1.22
--- http_core.h 1997/07/15 22:36:50 1.23
***************
*** 108,114 ****
char *auth_type (request_rec *);
char *auth_name (request_rec *);
API_EXPORT(int) satisfies (request_rec *r);
! array_header *requires (request_rec *);
#ifdef CORE_PRIVATE
--- 108,114 ----
char *auth_type (request_rec *);
char *auth_name (request_rec *);
API_EXPORT(int) satisfies (request_rec *r);
! API_EXPORT(array_header *) requires (request_rec *);
#ifdef CORE_PRIVATE
1.139 +1 -1 apache/src/http_protocol.c
Index: http_protocol.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_protocol.c,v
retrieving revision 1.138
retrieving revision 1.139
diff -C3 -r1.138 -r1.139
*** http_protocol.c 1997/07/15 21:39:56 1.138
--- http_protocol.c 1997/07/15 22:36:51 1.139
***************
*** 1525,1531 ****
return (chunk_start + len_read);
}
! API_EXPORT(long)send_fd(FILE *f, request_rec *r) {
return send_fd_length(f, r, -1);
}
--- 1525,1531 ----
return (chunk_start + len_read);
}
! API_EXPORT(long) send_fd(FILE *f, request_rec *r) {
return send_fd_length(f, r, -1);
}
1.14 +1 -1 apache/src/mod_asis.c
Index: mod_asis.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_asis.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C3 -r1.13 -r1.14
*** mod_asis.c 1997/04/06 07:43:40 1.13
--- mod_asis.c 1997/07/15 22:36:51 1.14
***************
*** 110,116 ****
{ NULL }
};
! module asis_module = {
STANDARD_MODULE_STUFF,
NULL, /* initializer */
NULL, /* create per-directory config structure */
--- 110,116 ----
{ NULL }
};
! module MODULE_VAR_EXPORT asis_module = {
STANDARD_MODULE_STUFF,
NULL, /* initializer */
NULL, /* create per-directory config structure */
1.18 +2 -2 apache/src/mod_auth.c
Index: mod_auth.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_auth.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C3 -r1.17 -r1.18
*** mod_auth.c 1997/06/28 19:55:17 1.17
--- mod_auth.c 1997/07/15 22:36:51 1.18
***************
*** 111,117 ****
{ NULL }
};
! module auth_module;
char *get_pw(request_rec *r, char *user, char *auth_pwfile)
{
--- 111,117 ----
{ NULL }
};
! module MODULE_VAR_EXPORT auth_module;
char *get_pw(request_rec *r, char *user, char *auth_pwfile)
{
***************
*** 280,286 ****
return AUTH_REQUIRED;
}
! module auth_module = {
STANDARD_MODULE_STUFF,
NULL, /* initializer */
create_auth_dir_config, /* dir config creater */
--- 280,286 ----
return AUTH_REQUIRED;
}
! module MODULE_VAR_EXPORT auth_module = {
STANDARD_MODULE_STUFF,
NULL, /* initializer */
create_auth_dir_config, /* dir config creater */
1.38 +2 -2 apache/src/mod_autoindex.c
Index: mod_autoindex.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_autoindex.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -C3 -r1.37 -r1.38
*** mod_autoindex.c 1997/07/15 15:51:09 1.37
--- mod_autoindex.c 1997/07/15 22:36:52 1.38
***************
*** 68,74 ****
#include "http_main.h"
#include "util_script.h"
! module autoindex_module;
/****************************************************************
*
--- 68,74 ----
#include "http_main.h"
#include "util_script.h"
! module MODULE_VAR_EXPORT autoindex_module;
/****************************************************************
*
***************
*** 931,937 ****
{ NULL }
};
! module autoindex_module = {
STANDARD_MODULE_STUFF,
NULL, /* initializer */
create_autoindex_config, /* dir config creater */
--- 931,937 ----
{ NULL }
};
! module MODULE_VAR_EXPORT autoindex_module = {
STANDARD_MODULE_STUFF,
NULL, /* initializer */
create_autoindex_config, /* dir config creater */
1.63 +1 -2 apache/src/util.c
Index: util.c
===================================================================
RCS file: /export/home/cvs/apache/src/util.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -C3 -r1.62 -r1.63
*** util.c 1997/07/15 21:39:58 1.62
--- util.c 1997/07/15 22:36:52 1.63
***************
*** 849,856 ****
}
}
! API_EXPORT(char *)construct_url(pool *p, const char *uri,
! const server_rec *s) {
return pstrcat (p, "http://";,
construct_server(p, s->server_hostname, s->port),
uri, NULL);
--- 849,855 ----
}
}
! API_EXPORT(char *) construct_url(pool *p, const char *uri, const server_rec
*s) {
return pstrcat (p, "http://";,
construct_server(p, s->server_hostname, s->port),
uri, NULL);
1.3 +3 -3 apache/src/nt/readdir.c
Index: readdir.c
===================================================================
RCS file: /export/home/cvs/apache/src/nt/readdir.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C3 -r1.2 -r1.3
*** readdir.c 1997/07/12 14:20:13 1.2
--- readdir.c 1997/07/15 22:36:58 1.3
***************
*** 17,23 ****
* The DIR typedef is not compatible with Unix.
**********************************************************************/
! DIR *opendir(const char *dir)
{
DIR *dp;
char *filespec;
--- 17,23 ----
* The DIR typedef is not compatible with Unix.
**********************************************************************/
! API_EXPORT(DIR *) opendir(const char *dir)
{
DIR *dp;
char *filespec;
***************
*** 49,55 ****
return dp;
}
! struct dirent *readdir(DIR *dp)
{
if (!dp || dp->finished) return NULL;
--- 49,55 ----
return dp;
}
! API_EXPORT(struct dirent *) readdir(DIR *dp)
{
if (!dp || dp->finished) return NULL;
***************
*** 69,75 ****
return &(dp->dent);
}
! int closedir(DIR *dp)
{
if (!dp) return 0;
_findclose(dp->handle);
--- 69,75 ----
return &(dp->dent);
}
! API_EXPORT(int) closedir(DIR *dp)
{
if (!dp) return 0;
_findclose(dp->handle);
1.3 +5 -3 apache/src/nt/readdir.h
Index: readdir.h
===================================================================
RCS file: /export/home/cvs/apache/src/nt/readdir.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C3 -r1.2 -r1.3
*** readdir.h 1997/07/12 14:20:14 1.2
--- readdir.h 1997/07/15 22:36:58 1.3
***************
*** 8,13 ****
--- 8,15 ----
#include <stdlib.h>
#include <sys/types.h>
+ #define API_EXPORT(type) __declspec(dllexport) type __stdcall
+
/* struct dirent - same as Unix */
struct dirent {
long d_ino; /* inode (always 1 in WIN32) */
***************
*** 27,32 ****
} DIR;
/* Function prototypes */
! DIR *opendir(const char *);
! struct dirent *readdir(DIR *);
! int closedir(DIR *);
--- 29,34 ----
} DIR;
/* Function prototypes */
! API_EXPORT(DIR *) opendir(const char *);
! API_EXPORT(struct dirent *) readdir(DIR *);
! API_EXPORT(int) closedir(DIR *);
1.1 apache/src/nt/.cvsignore
Index: .cvsignore
===================================================================
*.mdp
*.ncb
ModAccessD
ModActionsD
ModAliasD
ModCGID
ModMIMED
1.1 apache/src/nt/ApacheModuleAsis.mak
Index: ApacheModuleAsis.mak
===================================================================
# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
!IF "$(CFG)" == ""
CFG=ApacheModuleAsis - Win32 Debug
!MESSAGE No configuration specified. Defaulting to ApacheModuleAsis - Win32\
Debug.
!ENDIF
!IF "$(CFG)" != "ApacheModuleAsis - Win32 Release" && "$(CFG)" !=\
"ApacheModuleAsis - Win32 Debug"
!MESSAGE Invalid configuration "$(CFG)" specified.
!MESSAGE You can specify a configuration when running NMAKE on this makefile
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "ApacheModuleAsis.mak" CFG="ApacheModuleAsis - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "ApacheModuleAsis - Win32 Release" (based on\
"Win32 (x86) Dynamic-Link Library")
!MESSAGE "ApacheModuleAsis - Win32 Debug" (based on\
"Win32 (x86) Dynamic-Link Library")
!MESSAGE
!ERROR An invalid configuration is specified.
!ENDIF
!IF "$(OS)" == "Windows_NT"
NULL=
!ELSE
NULL=nul
!ENDIF
################################################################################
# Begin Project
# PROP Target_Last_Scanned "ApacheModuleAsis - Win32 Debug"
MTL=mktyplib.exe
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "ApacheModuleAsis - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "ModAsisR"
# PROP Intermediate_Dir "ModAsisR"
# PROP Target_Dir ""
OUTDIR=.\ModAsisR
INTDIR=.\ModAsisR
ALL : "$(OUTDIR)\ApacheModuleAsis.dll"
CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\mod_asis.obj"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAsis.dll"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAsis.exp"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAsis.lib"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
/YX /c
# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"\
/Fp"$(INTDIR)/ApacheModuleAsis.pch" /YX /Fo"$(INTDIR)/" /c
CPP_OBJS=.\ModAsisR/
CPP_SBRS=.\.
# ADD BASE MTL /nologo /D "NDEBUG" /win32
# ADD MTL /nologo /D "NDEBUG" /win32
MTL_PROJ=/nologo /D "NDEBUG" /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
BSC32_FLAGS=/nologo /o"$(OUTDIR)/ApacheModuleAsis.bsc"
BSC32_SBRS= \
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
# ADD LINK32 ..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
LINK32_FLAGS=..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll\
/incremental:no /pdb:"$(OUTDIR)/ApacheModuleAsis.pdb" /machine:I386\
/out:"$(OUTDIR)/ApacheModuleAsis.dll"
/implib:"$(OUTDIR)/ApacheModuleAsis.lib"
LINK32_OBJS= \
"$(INTDIR)\mod_asis.obj"
"$(OUTDIR)\ApacheModuleAsis.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
!ELSEIF "$(CFG)" == "ApacheModuleAsis - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "ModAsisD"
# PROP Intermediate_Dir "ModAsisD"
# PROP Target_Dir ""
OUTDIR=.\ModAsisD
INTDIR=.\ModAsisD
ALL : "$(OUTDIR)\ApacheModuleAsis.dll"
CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\mod_asis.obj"
[EMAIL PROTECTED] "$(INTDIR)\vc40.idb"
[EMAIL PROTECTED] "$(INTDIR)\vc40.pdb"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAsis.dll"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAsis.exp"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAsis.ilk"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAsis.lib"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAsis.pdb"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /YX /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\regex" /D "WIN32" /D
"_DEBUG" /D "_WINDOWS" /YX /c
CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\regex" /D "WIN32" /D
"_DEBUG"\
/D "_WINDOWS" /Fp"$(INTDIR)/ApacheModuleAsis.pch" /YX /Fo"$(INTDIR)/"\
/Fd"$(INTDIR)/" /c
CPP_OBJS=.\ModAsisD/
CPP_SBRS=.\.
# ADD BASE MTL /nologo /D "_DEBUG" /win32
# ADD MTL /nologo /D "_DEBUG" /win32
MTL_PROJ=/nologo /D "_DEBUG" /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
BSC32_FLAGS=/nologo /o"$(OUTDIR)/ApacheModuleAsis.bsc"
BSC32_SBRS= \
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386
# ADD LINK32 ..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug
/machine:I386
LINK32_FLAGS=..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll\
/incremental:yes /pdb:"$(OUTDIR)/ApacheModuleAsis.pdb" /debug /machine:I386\
/out:"$(OUTDIR)/ApacheModuleAsis.dll"
/implib:"$(OUTDIR)/ApacheModuleAsis.lib"
LINK32_OBJS= \
"$(INTDIR)\mod_asis.obj"
"$(OUTDIR)\ApacheModuleAsis.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
!ENDIF
.c{$(CPP_OBJS)}.obj:
$(CPP) $(CPP_PROJ) $<
.cpp{$(CPP_OBJS)}.obj:
$(CPP) $(CPP_PROJ) $<
.cxx{$(CPP_OBJS)}.obj:
$(CPP) $(CPP_PROJ) $<
.c{$(CPP_SBRS)}.sbr:
$(CPP) $(CPP_PROJ) $<
.cpp{$(CPP_SBRS)}.sbr:
$(CPP) $(CPP_PROJ) $<
.cxx{$(CPP_SBRS)}.sbr:
$(CPP) $(CPP_PROJ) $<
################################################################################
# Begin Target
# Name "ApacheModuleAsis - Win32 Release"
# Name "ApacheModuleAsis - Win32 Debug"
!IF "$(CFG)" == "ApacheModuleAsis - Win32 Release"
!ELSEIF "$(CFG)" == "ApacheModuleAsis - Win32 Debug"
!ENDIF
################################################################################
# Begin Source File
SOURCE=\work\apache\src\mod_asis.c
!IF "$(CFG)" == "ApacheModuleAsis - Win32 Release"
DEP_CPP_MOD_A=\
"..\alloc.h"\
"..\buff.h"\
"..\conf.h"\
"..\http_config.h"\
"..\http_log.h"\
"..\http_main.h"\
"..\http_protocol.h"\
"..\http_request.h"\
"..\httpd.h"\
"..\util_script.h"\
".\readdir.h"\
{$(INCLUDE)}"\sys\STAT.H"\
{$(INCLUDE)}"\sys\TYPES.H"\
NODEP_CPP_MOD_A=\
"..\sfio.h"\
"$(INTDIR)\mod_asis.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheModuleAsis - Win32 Debug"
DEP_CPP_MOD_A=\
"..\alloc.h"\
"..\buff.h"\
"..\conf.h"\
"..\http_config.h"\
"..\http_log.h"\
"..\http_main.h"\
"..\http_protocol.h"\
"..\http_request.h"\
"..\httpd.h"\
"..\regex\regex.h"\
"..\util_script.h"\
".\readdir.h"\
{$(INCLUDE)}"\sys\STAT.H"\
{$(INCLUDE)}"\sys\TYPES.H"\
NODEP_CPP_MOD_A=\
"..\sfio.h"\
"$(INTDIR)\mod_asis.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
# End Source File
# End Target
# End Project
################################################################################
1.1 apache/src/nt/ApacheModuleAuth.mak
Index: ApacheModuleAuth.mak
===================================================================
# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
!IF "$(CFG)" == ""
CFG=ApacheModuleAuth - Win32 Debug
!MESSAGE No configuration specified. Defaulting to ApacheModuleAuth - Win32\
Debug.
!ENDIF
!IF "$(CFG)" != "ApacheModuleAuth - Win32 Release" && "$(CFG)" !=\
"ApacheModuleAuth - Win32 Debug"
!MESSAGE Invalid configuration "$(CFG)" specified.
!MESSAGE You can specify a configuration when running NMAKE on this makefile
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "ApacheModuleAuth.mak" CFG="ApacheModuleAuth - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "ApacheModuleAuth - Win32 Release" (based on\
"Win32 (x86) Dynamic-Link Library")
!MESSAGE "ApacheModuleAuth - Win32 Debug" (based on\
"Win32 (x86) Dynamic-Link Library")
!MESSAGE
!ERROR An invalid configuration is specified.
!ENDIF
!IF "$(OS)" == "Windows_NT"
NULL=
!ELSE
NULL=nul
!ENDIF
################################################################################
# Begin Project
# PROP Target_Last_Scanned "ApacheModuleAuth - Win32 Debug"
MTL=mktyplib.exe
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "ApacheModuleAuth - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "ModAuthR"
# PROP Intermediate_Dir "ModAuthR"
# PROP Target_Dir ""
OUTDIR=.\ModAuthR
INTDIR=.\ModAuthR
ALL : "$(OUTDIR)\ApacheModuleAuth.dll"
CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\mod_auth.obj"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAuth.dll"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAuth.exp"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAuth.lib"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
/YX /c
# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\regex" /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /YX /c
CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\regex" /D "WIN32" /D "NDEBUG" /D\
"_WINDOWS" /Fp"$(INTDIR)/ApacheModuleAuth.pch" /YX /Fo"$(INTDIR)/" /c
CPP_OBJS=.\ModAuthR/
CPP_SBRS=.\.
# ADD BASE MTL /nologo /D "NDEBUG" /win32
# ADD MTL /nologo /D "NDEBUG" /win32
MTL_PROJ=/nologo /D "NDEBUG" /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
BSC32_FLAGS=/nologo /o"$(OUTDIR)/ApacheModuleAuth.bsc"
BSC32_SBRS= \
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
# ADD LINK32 ..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
LINK32_FLAGS=..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll\
/incremental:no /pdb:"$(OUTDIR)/ApacheModuleAuth.pdb" /machine:I386\
/out:"$(OUTDIR)/ApacheModuleAuth.dll"
/implib:"$(OUTDIR)/ApacheModuleAuth.lib"
LINK32_OBJS= \
"$(INTDIR)\mod_auth.obj"
"$(OUTDIR)\ApacheModuleAuth.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
!ELSEIF "$(CFG)" == "ApacheModuleAuth - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "ApacheMo"
# PROP BASE Intermediate_Dir "ApacheMo"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "ModAuthD"
# PROP Intermediate_Dir "ModAuthD"
# PROP Target_Dir ""
OUTDIR=.\ModAuthD
INTDIR=.\ModAuthD
ALL : "$(OUTDIR)\ApacheModuleAuth.dll"
CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\mod_auth.obj"
[EMAIL PROTECTED] "$(INTDIR)\vc40.idb"
[EMAIL PROTECTED] "$(INTDIR)\vc40.pdb"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAuth.dll"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAuth.exp"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAuth.ilk"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAuth.lib"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAuth.pdb"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /YX /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\regex" /D "WIN32" /D
"_DEBUG" /D "_WINDOWS" /YX /c
CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\regex" /D "WIN32" /D
"_DEBUG"\
/D "_WINDOWS" /Fp"$(INTDIR)/ApacheModuleAuth.pch" /YX /Fo"$(INTDIR)/"\
/Fd"$(INTDIR)/" /c
CPP_OBJS=.\ModAuthD/
CPP_SBRS=.\.
# ADD BASE MTL /nologo /D "_DEBUG" /win32
# ADD MTL /nologo /D "_DEBUG" /win32
MTL_PROJ=/nologo /D "_DEBUG" /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
BSC32_FLAGS=/nologo /o"$(OUTDIR)/ApacheModuleAuth.bsc"
BSC32_SBRS= \
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386
# ADD LINK32 ..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug
/machine:I386
LINK32_FLAGS=..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll\
/incremental:yes /pdb:"$(OUTDIR)/ApacheModuleAuth.pdb" /debug /machine:I386\
/out:"$(OUTDIR)/ApacheModuleAuth.dll"
/implib:"$(OUTDIR)/ApacheModuleAuth.lib"
LINK32_OBJS= \
"$(INTDIR)\mod_auth.obj"
"$(OUTDIR)\ApacheModuleAuth.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
!ENDIF
.c{$(CPP_OBJS)}.obj:
$(CPP) $(CPP_PROJ) $<
.cpp{$(CPP_OBJS)}.obj:
$(CPP) $(CPP_PROJ) $<
.cxx{$(CPP_OBJS)}.obj:
$(CPP) $(CPP_PROJ) $<
.c{$(CPP_SBRS)}.sbr:
$(CPP) $(CPP_PROJ) $<
.cpp{$(CPP_SBRS)}.sbr:
$(CPP) $(CPP_PROJ) $<
.cxx{$(CPP_SBRS)}.sbr:
$(CPP) $(CPP_PROJ) $<
################################################################################
# Begin Target
# Name "ApacheModuleAuth - Win32 Release"
# Name "ApacheModuleAuth - Win32 Debug"
!IF "$(CFG)" == "ApacheModuleAuth - Win32 Release"
!ELSEIF "$(CFG)" == "ApacheModuleAuth - Win32 Debug"
!ENDIF
################################################################################
# Begin Source File
SOURCE=\work\apache\src\mod_auth.c
!IF "$(CFG)" == "ApacheModuleAuth - Win32 Release"
DEP_CPP_MOD_A=\
"..\alloc.h"\
"..\buff.h"\
"..\conf.h"\
"..\http_config.h"\
"..\http_core.h"\
"..\http_log.h"\
"..\http_protocol.h"\
"..\httpd.h"\
"..\regex\regex.h"\
".\readdir.h"\
{$(INCLUDE)}"\sys\STAT.H"\
{$(INCLUDE)}"\sys\TYPES.H"\
NODEP_CPP_MOD_A=\
"..\sfio.h"\
"$(INTDIR)\mod_auth.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheModuleAuth - Win32 Debug"
DEP_CPP_MOD_A=\
"..\conf.h"\
"..\http_config.h"\
"..\http_core.h"\
"..\http_log.h"\
"..\http_protocol.h"\
"..\httpd.h"\
"$(INTDIR)\mod_auth.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
# End Source File
# End Target
# End Project
################################################################################
1.1 apache/src/nt/ApacheModuleAutoIndex.mak
Index: ApacheModuleAutoIndex.mak
===================================================================
# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
!IF "$(CFG)" == ""
CFG=ApacheModuleAutoIndex - Win32 Debug
!MESSAGE No configuration specified. Defaulting to ApacheModuleAutoIndex -\
Win32 Debug.
!ENDIF
!IF "$(CFG)" != "ApacheModuleAutoIndex - Win32 Release" && "$(CFG)" !=\
"ApacheModuleAutoIndex - Win32 Debug"
!MESSAGE Invalid configuration "$(CFG)" specified.
!MESSAGE You can specify a configuration when running NMAKE on this makefile
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "ApacheModuleAutoIndex.mak"\
CFG="ApacheModuleAutoIndex - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "ApacheModuleAutoIndex - Win32 Release" (based on\
"Win32 (x86) Dynamic-Link Library")
!MESSAGE "ApacheModuleAutoIndex - Win32 Debug" (based on\
"Win32 (x86) Dynamic-Link Library")
!MESSAGE
!ERROR An invalid configuration is specified.
!ENDIF
!IF "$(OS)" == "Windows_NT"
NULL=
!ELSE
NULL=nul
!ENDIF
################################################################################
# Begin Project
# PROP Target_Last_Scanned "ApacheModuleAutoIndex - Win32 Debug"
MTL=mktyplib.exe
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "ApacheModuleAutoIndex - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "AutoIndexR"
# PROP Intermediate_Dir "AutoIndexR"
# PROP Target_Dir ""
OUTDIR=.\AutoIndexR
INTDIR=.\AutoIndexR
ALL : "$(OUTDIR)\ApacheModuleAutoIndex.dll"
CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\mod_autoindex.obj"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAutoIndex.dll"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAutoIndex.exp"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAutoIndex.lib"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
/YX /c
# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\regex" /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /YX /c
CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\regex" /D "WIN32" /D "NDEBUG" /D\
"_WINDOWS" /Fp"$(INTDIR)/ApacheModuleAutoIndex.pch" /YX /Fo"$(INTDIR)/" /c
CPP_OBJS=.\AutoIndexR/
CPP_SBRS=.\.
# ADD BASE MTL /nologo /D "NDEBUG" /win32
# ADD MTL /nologo /D "NDEBUG" /win32
MTL_PROJ=/nologo /D "NDEBUG" /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
BSC32_FLAGS=/nologo /o"$(OUTDIR)/ApacheModuleAutoIndex.bsc"
BSC32_SBRS= \
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
# ADD LINK32 ..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
LINK32_FLAGS=..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll\
/incremental:no /pdb:"$(OUTDIR)/ApacheModuleAutoIndex.pdb" /machine:I386\
/out:"$(OUTDIR)/ApacheModuleAutoIndex.dll"\
/implib:"$(OUTDIR)/ApacheModuleAutoIndex.lib"
LINK32_OBJS= \
"$(INTDIR)\mod_autoindex.obj"
"$(OUTDIR)\ApacheModuleAutoIndex.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
!ELSEIF "$(CFG)" == "ApacheModuleAutoIndex - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "AutoIndexD"
# PROP Intermediate_Dir "AutoIndexD"
# PROP Target_Dir ""
OUTDIR=.\AutoIndexD
INTDIR=.\AutoIndexD
ALL : "$(OUTDIR)\ApacheModuleAutoIndex.dll"
CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\mod_autoindex.obj"
[EMAIL PROTECTED] "$(INTDIR)\vc40.idb"
[EMAIL PROTECTED] "$(INTDIR)\vc40.pdb"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAutoIndex.dll"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAutoIndex.exp"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAutoIndex.ilk"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAutoIndex.lib"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAutoIndex.pdb"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /YX /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\regex" /D "WIN32" /D
"_DEBUG" /D "_WINDOWS" /YX /c
CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\regex" /D "WIN32" /D
"_DEBUG"\
/D "_WINDOWS" /Fp"$(INTDIR)/ApacheModuleAutoIndex.pch" /YX /Fo"$(INTDIR)/"\
/Fd"$(INTDIR)/" /c
CPP_OBJS=.\AutoIndexD/
CPP_SBRS=.\.
# ADD BASE MTL /nologo /D "_DEBUG" /win32
# ADD MTL /nologo /D "_DEBUG" /win32
MTL_PROJ=/nologo /D "_DEBUG" /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
BSC32_FLAGS=/nologo /o"$(OUTDIR)/ApacheModuleAutoIndex.bsc"
BSC32_SBRS= \
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386
# ADD LINK32 ..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug
/machine:I386
LINK32_FLAGS=..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll\
/incremental:yes /pdb:"$(OUTDIR)/ApacheModuleAutoIndex.pdb" /debug\
/machine:I386 /out:"$(OUTDIR)/ApacheModuleAutoIndex.dll"\
/implib:"$(OUTDIR)/ApacheModuleAutoIndex.lib"
LINK32_OBJS= \
"$(INTDIR)\mod_autoindex.obj"
"$(OUTDIR)\ApacheModuleAutoIndex.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
!ENDIF
.c{$(CPP_OBJS)}.obj:
$(CPP) $(CPP_PROJ) $<
.cpp{$(CPP_OBJS)}.obj:
$(CPP) $(CPP_PROJ) $<
.cxx{$(CPP_OBJS)}.obj:
$(CPP) $(CPP_PROJ) $<
.c{$(CPP_SBRS)}.sbr:
$(CPP) $(CPP_PROJ) $<
.cpp{$(CPP_SBRS)}.sbr:
$(CPP) $(CPP_PROJ) $<
.cxx{$(CPP_SBRS)}.sbr:
$(CPP) $(CPP_PROJ) $<
################################################################################
# Begin Target
# Name "ApacheModuleAutoIndex - Win32 Release"
# Name "ApacheModuleAutoIndex - Win32 Debug"
!IF "$(CFG)" == "ApacheModuleAutoIndex - Win32 Release"
!ELSEIF "$(CFG)" == "ApacheModuleAutoIndex - Win32 Debug"
!ENDIF
################################################################################
# Begin Source File
SOURCE=\work\apache\src\mod_autoindex.c
!IF "$(CFG)" == "ApacheModuleAutoIndex - Win32 Release"
DEP_CPP_MOD_A=\
"..\alloc.h"\
"..\buff.h"\
"..\conf.h"\
"..\http_config.h"\
"..\http_core.h"\
"..\http_log.h"\
"..\http_main.h"\
"..\http_protocol.h"\
"..\http_request.h"\
"..\httpd.h"\
"..\regex\regex.h"\
"..\util_script.h"\
".\readdir.h"\
{$(INCLUDE)}"\sys\STAT.H"\
{$(INCLUDE)}"\sys\TYPES.H"\
NODEP_CPP_MOD_A=\
"..\sfio.h"\
"$(INTDIR)\mod_autoindex.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheModuleAutoIndex - Win32 Debug"
DEP_CPP_MOD_A=\
"..\alloc.h"\
"..\buff.h"\
"..\conf.h"\
"..\http_config.h"\
"..\http_core.h"\
"..\http_log.h"\
"..\http_main.h"\
"..\http_protocol.h"\
"..\http_request.h"\
"..\httpd.h"\
"..\util_script.h"\
".\readdir.h"\
{$(INCLUDE)}"\sys\TYPES.H"\
NODEP_CPP_MOD_A=\
"..\sfio.h"\
"$(INTDIR)\mod_autoindex.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
# End Source File
# End Target
# End Project
################################################################################
