ben 97/07/13 12:01:38
Modified: src CHANGES Makefile.nt alloc.c alloc.h apache.mak buff.c buff.h conf.h http_conf_globals.h http_config.c http_config.h http_core.c http_core.h http_log.c http_log.h http_main.c http_main.h http_protocol.c http_protocol.h http_request.c http_request.h httpd.h mod_access.c mod_alias.c mod_cgi.c mod_mime.c util.c util_script.c util_script.h src/regex regex.h regex.mak regexec.c Added: src ApacheCore.def ApacheCore.mak ApacheLaunch.mak dummy.c src/nt ApacheModuleAccess.mak ApacheModuleActions.mak ApacheModuleAlias.mak ApacheModuleCGI.mak ApacheModuleMIME.mak mod_dll.c modules_dll.c Log: DLLify modules under Win32. Submitted by: Alexei Kosut and Ben Laurie Revision Changes Path 1.333 +5 -0 apache/src/CHANGES Index: CHANGES =================================================================== RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.332 retrieving revision 1.333 diff -C3 -r1.332 -r1.333 *** CHANGES 1997/07/10 18:32:45 1.332 --- CHANGES 1997/07/13 19:01:06 1.333 *************** *** 1,5 **** --- 1,10 ---- Changes with Apache 1.3 + *) Make modules DLLs, dynamically loaded, using LoadModule/LoadFile + on Win32. + Note that module DLLs must be compiled with the multithreaded DLL + version of the runtime library. [Alexei Kosut and Ben Laurie] + *) Sequent port re-added and SONY NEWS-OS port included. *) Automatic indexing removed from mod_dir and placed into mod_autoindex. 1.2 +10 -1 apache/src/Makefile.nt Index: Makefile.nt =================================================================== RCS file: /export/home/cvs/apache/src/Makefile.nt,v retrieving revision 1.1 retrieving revision 1.2 diff -C3 -r1.1 -r1.2 *** Makefile.nt 1997/07/05 22:12:24 1.1 --- Makefile.nt 1997/07/13 19:01:06 1.2 *************** *** 9,12 **** _debug: cd modules\proxy & set CFG=proxy - Win32 Debug& nmake -f proxy.mak cd regex & set CFG=regex - Win32 Debug& nmake -f regex.mak ! set CFG=apache - Win32 Debug& nmake -f apache.mak \ No newline at end of file --- 9,21 ---- _debug: cd modules\proxy & set CFG=proxy - Win32 Debug& nmake -f proxy.mak cd regex & set CFG=regex - Win32 Debug& nmake -f regex.mak ! set CFG=apache - Win32 Debug& nmake -f apache.mak ! ! installd: ! -mkdir \Apache ! copy LaunchD\ApacheLaunch.exe \Apache ! copy CoreD\ApacheCore.dll \Apache ! copy nt\ModAccessD\ApacheModuleAccess.dll \Apache ! copy nt\ModAliasD\ApacheModuleAlias.dll \Apache ! copy nt\ModCGID\ApacheModuleCGI.dll \Apache ! copy nt\ModMIMED\ApacheModuleMIME.dll \Apache 1.38 +43 -43 apache/src/alloc.c Index: alloc.c =================================================================== RCS file: /export/home/cvs/apache/src/alloc.c,v retrieving revision 1.37 retrieving revision 1.38 diff -C3 -r1.37 -r1.38 *** alloc.c 1997/07/08 06:32:33 1.37 --- alloc.c 1997/07/13 19:01:07 1.38 *************** *** 262,268 **** #define POOL_HDR_CLICKS (1 + ((sizeof(struct pool) - 1) / CLICK_SZ)) #define POOL_HDR_BYTES (POOL_HDR_CLICKS * CLICK_SZ) ! struct pool *make_sub_pool (struct pool *p) { union block_hdr *blok; pool *new_pool; --- 262,268 ---- #define POOL_HDR_CLICKS (1 + ((sizeof(struct pool) - 1) / CLICK_SZ)) #define POOL_HDR_BYTES (POOL_HDR_CLICKS * CLICK_SZ) ! API_EXPORT(struct pool *) make_sub_pool (struct pool *p) { union block_hdr *blok; pool *new_pool; *************** *** 318,324 **** unblock_alarms(); } ! void destroy_pool (pool *a) { block_alarms(); clear_pool (a); --- 318,324 ---- unblock_alarms(); } ! API_EXPORT(void) destroy_pool (pool *a) { block_alarms(); clear_pool (a); *************** *** 342,348 **** */ ! void *palloc (struct pool *a, int reqsize) { /* Round up requested size to an even number of alignment units (core clicks) */ --- 342,348 ---- */ ! API_EXPORT(void *) palloc (struct pool *a, int reqsize) { /* Round up requested size to an even number of alignment units (core clicks) */ *************** *** 388,401 **** return (void *)first_avail; } ! void *pcalloc(struct pool *a, int size) { void *res = palloc (a, size); memset (res, '\0', size); return res; } ! char *pstrdup(struct pool *a, const char *s) { char *res; if (s == NULL) return NULL; --- 388,401 ---- return (void *)first_avail; } ! API_EXPORT(void *) pcalloc(struct pool *a, int size) { void *res = palloc (a, size); memset (res, '\0', size); return res; } ! API_EXPORT(char *) pstrdup(struct pool *a, const char *s) { char *res; if (s == NULL) return NULL; *************** *** 404,410 **** return res; } ! char *pstrndup(struct pool *a, const char *s, int n) { char *res; if (s == NULL) return NULL; --- 404,410 ---- return res; } ! API_EXPORT(char *) pstrndup(struct pool *a, const char *s, int n) { char *res; if (s == NULL) return NULL; *************** *** 457,463 **** * The 'array' functions... */ ! array_header *make_array (pool *p, int nelts, int elt_size) { array_header *res = (array_header *)palloc(p, sizeof(array_header)); --- 457,463 ---- * The 'array' functions... */ ! API_EXPORT(array_header *) make_array (pool *p, int nelts, int elt_size) { array_header *res = (array_header *)palloc(p, sizeof(array_header)); *************** *** 475,481 **** return res; } ! void *push_array (array_header *arr) { if (arr->nelts == arr->nalloc) { int new_size = (arr->nalloc <= 0) ? 1 : arr->nalloc * 2; --- 475,481 ---- return res; } ! API_EXPORT(void *) push_array (array_header *arr) { if (arr->nelts == arr->nalloc) { int new_size = (arr->nalloc <= 0) ? 1 : arr->nalloc * 2; *************** *** 492,498 **** return arr->elts + (arr->elt_size * (arr->nelts - 1)); } ! void array_cat (array_header *dst, const array_header *src) { int elt_size = dst->elt_size; --- 492,498 ---- return arr->elts + (arr->elt_size * (arr->nelts - 1)); } ! API_EXPORT(void) array_cat (array_header *dst, const array_header *src) { int elt_size = dst->elt_size; *************** *** 514,520 **** dst->nelts += src->nelts; } ! array_header *copy_array (pool *p, const array_header *arr) { array_header *res = make_array (p, arr->nalloc, arr->elt_size); --- 514,520 ---- dst->nelts += src->nelts; } ! API_EXPORT(array_header *) copy_array (pool *p, const array_header *arr) { array_header *res = make_array (p, arr->nalloc, arr->elt_size); *************** *** 530,536 **** * overhead of the full copy only where it is really needed. */ ! array_header *copy_array_hdr (pool *p, const array_header *arr) { array_header *res = (array_header *)palloc(p, sizeof(array_header)); --- 530,536 ---- * overhead of the full copy only where it is really needed. */ ! API_EXPORT(array_header *) copy_array_hdr (pool *p, const array_header *arr) { array_header *res = (array_header *)palloc(p, sizeof(array_header)); *************** *** 546,552 **** /* The above is used here to avoid consing multiple new array bodies... */ ! array_header *append_arrays (pool *p, const array_header *first, const array_header *second) { --- 546,552 ---- /* The above is used here to avoid consing multiple new array bodies... */ ! API_EXPORT(array_header *) append_arrays (pool *p, const array_header *first, const array_header *second) { *************** *** 562,583 **** * The "table" functions. */ ! table *make_table (pool *p, int nelts) { return make_array (p, nelts, sizeof (table_entry)); } ! table *copy_table (pool *p, const table *t) { return copy_array (p, t); } ! void clear_table (table *t) { t->nelts = 0; } ! array_header *table_elts (table *t) { return t; } ! char *table_get (const table *t, const char *key) { table_entry *elts = (table_entry *)t->elts; int i; --- 562,583 ---- * The "table" functions. */ ! API_EXPORT(table *) make_table (pool *p, int nelts) { return make_array (p, nelts, sizeof (table_entry)); } ! API_EXPORT(table *) copy_table (pool *p, const table *t) { return copy_array (p, t); } ! API_EXPORT(void) clear_table (table *t) { t->nelts = 0; } ! API_EXPORT(array_header *) table_elts (table *t) { return t; } ! API_EXPORT(char *) table_get (const table *t, const char *key) { table_entry *elts = (table_entry *)t->elts; int i; *************** *** 591,597 **** return NULL; } ! void table_set (table *t, const char *key, const char *val) { register int i, j, k; table_entry *elts = (table_entry *)t->elts; --- 591,597 ---- return NULL; } ! API_EXPORT(void) table_set (table *t, const char *key, const char *val) { register int i, j, k; table_entry *elts = (table_entry *)t->elts; *************** *** 619,625 **** } } ! void table_unset( table *t, const char *key ) { register int i, j, k; table_entry *elts = (table_entry *)t->elts; --- 619,625 ---- } } ! API_EXPORT(void) table_unset( table *t, const char *key ) { register int i, j, k; table_entry *elts = (table_entry *)t->elts; *************** *** 640,646 **** } } ! void table_merge (table *t, const char *key, const char *val) { table_entry *elts = (table_entry *)t->elts; int i; --- 640,646 ---- } } ! API_EXPORT(void) table_merge (table *t, const char *key, const char *val) { table_entry *elts = (table_entry *)t->elts; int i; *************** *** 656,662 **** elts->val = pstrdup (t->pool, val); } ! void table_add (table *t, const char *key, const char *val) { table_entry *elts = (table_entry *)t->elts; --- 656,662 ---- elts->val = pstrdup (t->pool, val); } ! API_EXPORT(void) table_add (table *t, const char *key, const char *val) { table_entry *elts = (table_entry *)t->elts; *************** *** 665,671 **** elts->val = pstrdup (t->pool, val); } ! table* overlay_tables (pool *p, const table *overlay, const table *base) { return append_arrays (p, overlay, base); } --- 665,671 ---- elts->val = pstrdup (t->pool, val); } ! API_EXPORT(table *) overlay_tables (pool *p, const table *overlay, const table *base) { return append_arrays (p, overlay, base); } *************** *** 727,733 **** struct cleanup *next; }; ! void register_cleanup (pool *p, void *data, void (*plain_cleanup)(void *), void (*child_cleanup)(void *)) { struct cleanup *c = (struct cleanup *)palloc(p, sizeof (struct cleanup)); --- 727,733 ---- struct cleanup *next; }; ! API_EXPORT(void) register_cleanup (pool *p, void *data, void (*plain_cleanup)(void *), void (*child_cleanup)(void *)) { struct cleanup *c = (struct cleanup *)palloc(p, sizeof (struct cleanup)); *************** *** 738,744 **** p->cleanups = c; } ! void kill_cleanup (pool *p, void *data, void (*cleanup)(void *)) { struct cleanup *c = p->cleanups; struct cleanup **lastp = &p->cleanups; --- 738,744 ---- p->cleanups = c; } ! API_EXPORT(void) kill_cleanup (pool *p, void *data, void (*cleanup)(void *)) { struct cleanup *c = p->cleanups; struct cleanup **lastp = &p->cleanups; *************** *** 754,760 **** } } ! void run_cleanup (pool *p, void *data, void (*cleanup)(void *)) { block_alarms(); /* Run cleanup only once! */ (*cleanup)(data); --- 754,760 ---- } } ! API_EXPORT(void) run_cleanup (pool *p, void *data, void (*cleanup)(void *)) { block_alarms(); /* Run cleanup only once! */ (*cleanup)(data); *************** *** 787,793 **** cleanup_pool_for_exec (p); } ! void cleanup_for_exec() { #ifndef WIN32 /* --- 787,793 ---- cleanup_pool_for_exec (p); } ! API_EXPORT(void) cleanup_for_exec() { #ifndef WIN32 /* *************** *** 813,828 **** static void fd_cleanup (void *fdv) { close ((int)fdv); } ! void note_cleanups_for_fd (pool *p, int fd) { register_cleanup (p, (void *)fd, fd_cleanup, fd_cleanup); } ! void kill_cleanups_for_fd(pool *p,int fd) { kill_cleanup(p,(void *)fd,fd_cleanup); } ! int popenf(pool *a, const char *name, int flg, int mode) { int fd; int save_errno; --- 813,828 ---- static void fd_cleanup (void *fdv) { close ((int)fdv); } ! API_EXPORT(void) note_cleanups_for_fd (pool *p, int fd) { register_cleanup (p, (void *)fd, fd_cleanup, fd_cleanup); } ! API_EXPORT(void) kill_cleanups_for_fd(pool *p,int fd) { kill_cleanup(p,(void *)fd,fd_cleanup); } ! API_EXPORT(int) popenf(pool *a, const char *name, int flg, int mode) { int fd; int save_errno; *************** *** 839,845 **** return fd; } ! int pclosef(pool *a, int fd) { int res; int save_errno; --- 839,845 ---- return fd; } ! API_EXPORT(int) pclosef(pool *a, int fd) { int res; int save_errno; *************** *** 861,871 **** static void file_cleanup (void *fpv) { fclose ((FILE *)fpv); } static void file_child_cleanup (void *fpv) { close (fileno ((FILE *)fpv)); } ! void note_cleanups_for_file (pool *p, FILE *fp) { register_cleanup (p, (void *)fp, file_cleanup, file_child_cleanup); } ! FILE *pfopen(pool *a, const char *name, const char *mode) { FILE *fd = NULL; int baseFlag, desc; --- 861,871 ---- static void file_cleanup (void *fpv) { fclose ((FILE *)fpv); } static void file_child_cleanup (void *fpv) { close (fileno ((FILE *)fpv)); } ! API_EXPORT(void) note_cleanups_for_file (pool *p, FILE *fp) { register_cleanup (p, (void *)fp, file_cleanup, file_child_cleanup); } ! API_EXPORT(FILE *) pfopen(pool *a, const char *name, const char *mode) { FILE *fd = NULL; int baseFlag, desc; *************** *** 897,903 **** return fd; } ! FILE *pfdopen(pool *a,int fd, const char *mode) { FILE *f; --- 897,903 ---- return fd; } ! API_EXPORT(FILE *) pfdopen(pool *a,int fd, const char *mode) { FILE *f; *************** *** 910,916 **** } ! int pfclose(pool *a, FILE *fd) { int res; --- 910,916 ---- } ! API_EXPORT(int) pfclose(pool *a, FILE *fd) { int res; *************** *** 930,936 **** closedir ((DIR *)dv); } ! DIR *popendir (pool *p, const char *name) { DIR *d; int save_errno; --- 930,936 ---- closedir ((DIR *)dv); } ! API_EXPORT(DIR *) popendir (pool *p, const char *name) { DIR *d; int save_errno; *************** *** 948,954 **** return d; } ! void pclosedir (pool *p, DIR *d) { block_alarms (); kill_cleanup (p, (void *)d, dir_cleanup); --- 948,954 ---- return d; } ! API_EXPORT(void) pclosedir (pool *p, DIR *d) { block_alarms (); kill_cleanup (p, (void *)d, dir_cleanup); *************** *** 969,984 **** rv = closesocket((int)fdv); } ! void note_cleanups_for_socket (pool *p, int fd) { register_cleanup (p, (void *)fd, socket_cleanup, socket_cleanup); } ! void kill_cleanups_for_socket(pool *p,int sock) { kill_cleanup(p,(void *)sock,socket_cleanup); } ! int pclosesocket(pool *a, int sock) { int res; int save_errno; --- 969,984 ---- rv = closesocket((int)fdv); } ! API_EXPORT(void) note_cleanups_for_socket (pool *p, int fd) { register_cleanup (p, (void *)fd, socket_cleanup, socket_cleanup); } ! API_EXPORT(void) kill_cleanups_for_socket(pool *p,int sock) { kill_cleanup(p,(void *)sock,socket_cleanup); } ! API_EXPORT(int) pclosesocket(pool *a, int sock) { int res; int save_errno; *************** *** 1006,1012 **** static void regex_cleanup (void *preg) { regfree ((regex_t *)preg); } ! regex_t *pregcomp(pool *p, const char *pattern, int cflags) { regex_t *preg = palloc(p, sizeof(regex_t)); if (regcomp(preg, pattern, cflags)) --- 1006,1012 ---- static void regex_cleanup (void *preg) { regfree ((regex_t *)preg); } ! API_EXPORT(regex_t *) pregcomp(pool *p, const char *pattern, int cflags) { regex_t *preg = palloc(p, sizeof(regex_t)); if (regcomp(preg, pattern, cflags)) *************** *** 1018,1024 **** } ! void pregfree(pool *p, regex_t *reg) { block_alarms(); regfree (reg); --- 1018,1024 ---- } ! API_EXPORT(void) pregfree(pool *p, regex_t *reg) { block_alarms(); regfree (reg); *************** *** 1061,1067 **** #endif /* WIN32 */ ! int spawn_child_err_buff (pool *p, int (*func)(void *), void *data, enum kill_conditions kill_how, BUFF **pipe_in, BUFF **pipe_out, BUFF **pipe_err) { --- 1061,1067 ---- #endif /* WIN32 */ ! API_EXPORT(int) spawn_child_err_buff (pool *p, int (*func)(void *), void *data, enum kill_conditions kill_how, BUFF **pipe_in, BUFF **pipe_out, BUFF **pipe_err) { *************** *** 1252,1258 **** return pid; } ! int spawn_child_err (pool *p, int (*func)(void *), void *data, enum kill_conditions kill_how, FILE **pipe_in, FILE **pipe_out, FILE **pipe_err) { --- 1252,1258 ---- return pid; } ! API_EXPORT(int) spawn_child_err (pool *p, int (*func)(void *), void *data, enum kill_conditions kill_how, FILE **pipe_in, FILE **pipe_out, FILE **pipe_err) { 1.28 +46 -46 apache/src/alloc.h Index: alloc.h =================================================================== RCS file: /export/home/cvs/apache/src/alloc.h,v retrieving revision 1.27 retrieving revision 1.28 diff -C3 -r1.27 -r1.28 *** alloc.h 1997/07/12 12:33:12 1.27 --- alloc.h 1997/07/13 19:01:07 1.28 *************** *** 81,88 **** extern pool *permanent_pool; void init_alloc(); /* Set up everything */ ! pool *make_sub_pool (pool *); /* All pools are subpools of permanent_pool */ ! void destroy_pool (pool *); /* Clearing out EVERYTHING in an pool... destroys any sub-pools */ --- 81,88 ---- extern pool *permanent_pool; void init_alloc(); /* Set up everything */ ! API_EXPORT(pool *) make_sub_pool (pool *); /* All pools are subpools of permanent_pool */ ! API_EXPORT(void) destroy_pool (pool *); /* Clearing out EVERYTHING in an pool... destroys any sub-pools */ *************** *** 92,106 **** * buffers, *don't* wait for subprocesses, and *don't* free any memory. */ ! void cleanup_for_exec (); /* routines to allocate memory from an pool... */ ! void *palloc(struct pool *, int nbytes); ! void *pcalloc(struct pool *, int nbytes); ! extern char *pstrdup(struct pool *, const char *s); ! extern char *pstrndup(struct pool *, const char *s, int n); ! char *pstrcat(struct pool *, ...); /* all '...' must be char* */ /* array and alist management... keeping lists of things. * Common enough to want common support code ... --- 92,106 ---- * buffers, *don't* wait for subprocesses, and *don't* free any memory. */ ! API_EXPORT(void) cleanup_for_exec (); /* routines to allocate memory from an pool... */ ! API_EXPORT(void *) palloc(struct pool *, int nbytes); ! API_EXPORT(void *) pcalloc(struct pool *, int nbytes); ! API_EXPORT(char *) pstrdup(struct pool *, const char *s); ! API_EXPORT(char *) pstrndup(struct pool *, const char *s, int n); ! API_EXPORT(char *) pstrcat(struct pool *, ...); /* all '...' must be char* */ /* array and alist management... keeping lists of things. * Common enough to want common support code ... *************** *** 114,123 **** char *elts; } array_header; ! array_header *make_array (pool *p, int nelts, int elt_size); ! void *push_array (array_header *); ! void array_cat (array_header *dst, const array_header *src); ! array_header *append_arrays (pool *, const array_header *, const array_header *); /* copy_array copies the *entire* array. copy_array_hdr just copies --- 114,123 ---- char *elts; } array_header; ! API_EXPORT(array_header *) make_array (pool *p, int nelts, int elt_size); ! API_EXPORT(void *) push_array (array_header *); ! API_EXPORT(void) array_cat (array_header *dst, const array_header *src); ! API_EXPORT(array_header *) append_arrays (pool *, const array_header *, const array_header *); /* copy_array copies the *entire* array. copy_array_hdr just copies *************** *** 125,132 **** * if) the code subsequently does a push or arraycat. */ ! array_header *copy_array (pool *p, const array_header *src); ! array_header *copy_array_hdr (pool *p, const array_header *src); /* Tables. Implemented alist style, for now, though we try to keep --- 125,132 ---- * if) the code subsequently does a push or arraycat. */ ! API_EXPORT(array_header *) copy_array (pool *p, const array_header *src); ! API_EXPORT(array_header *) copy_array_hdr (pool *p, const array_header *src); /* Tables. Implemented alist style, for now, though we try to keep *************** *** 147,166 **** char *val; } table_entry; ! table *make_table (pool *p, int nelts); ! table *copy_table (pool *p, const table *); ! void clear_table (table *); ! char *table_get (const table *, const char *); ! void table_set (table *, const char *name, const char *val); ! void table_merge (table *, const char *name, const char *more_val); ! void table_unset (table *, const char *key); ! void table_add (table *, const char *name, const char *val); ! void table_do (int (*comp)(void *, const char *, const char *), void *rec, const table *t, ...); ! table *overlay_tables (pool *p, const table *overlay, const table *base); ! array_header *table_elts (table *); #define is_empty_table(t) (((t) == NULL)||((t)->nelts == 0)) --- 147,166 ---- char *val; } table_entry; ! API_EXPORT(table *) make_table (pool *p, int nelts); ! API_EXPORT(table *) copy_table (pool *p, const table *); ! API_EXPORT(void) clear_table (table *); ! API_EXPORT(char *) table_get (const table *, const char *); ! API_EXPORT(void) table_set (table *, const char *name, const char *val); ! API_EXPORT(void) table_merge (table *, const char *name, const char *more_val); ! API_EXPORT(void) table_unset (table *, const char *key); ! API_EXPORT(void) table_add (table *, const char *name, const char *val); ! API_EXPORT(void) table_do (int (*comp)(void *, const char *, const char *), void *rec, const table *t, ...); ! API_EXPORT(table *) overlay_tables (pool *p, const table *overlay, const table *base); ! API_EXPORT(array_header *) table_elts (table *); #define is_empty_table(t) (((t) == NULL)||((t)->nelts == 0)) *************** *** 186,197 **** * unblock_alarms() below... */ ! void register_cleanup (pool *p, void *data, void (*plain_cleanup)(void *), void (*child_cleanup)(void *)); ! void kill_cleanup (pool *p, void *data, void (*plain_cleanup)(void *)); ! void run_cleanup (pool *p, void *data, void (*cleanup)(void *)); /* The time between when a resource is actually allocated, and when it * its cleanup is registered is a critical section, during which the --- 186,197 ---- * unblock_alarms() below... */ ! API_EXPORT(void) register_cleanup (pool *p, void *data, void (*plain_cleanup)(void *), void (*child_cleanup)(void *)); ! API_EXPORT(void) kill_cleanup (pool *p, void *data, void (*plain_cleanup)(void *)); ! API_EXPORT(void) run_cleanup (pool *p, void *data, void (*cleanup)(void *)); /* The time between when a resource is actually allocated, and when it * its cleanup is registered is a critical section, during which the *************** *** 210,240 **** * the note_cleanups_for_foo routines are for */ ! FILE *pfopen(struct pool *, const char *name, const char *fmode); ! FILE *pfdopen(struct pool *, int fd, const char *fmode); ! int popenf(struct pool *, const char *name, int flg, int mode); ! ! void note_cleanups_for_file (pool *, FILE *); ! void note_cleanups_for_fd (pool *, int); ! void kill_cleanups_for_fd (pool *p, int fd); ! ! void note_cleanups_for_socket (pool *, int); ! void kill_cleanups_for_socket (pool *p, int sock); ! int pclosesocket(pool *a, int sock); ! regex_t *pregcomp (pool *p, const char *pattern, int cflags); ! void pregfree (pool *p, regex_t *reg); /* routines to note closes... file descriptors are constrained enough * on some systems that we want to support this. */ ! int pfclose(struct pool *, FILE *); ! int pclosef(struct pool *, int fd); /* routines to deal with directories */ ! DIR *popendir (pool *p, const char *name); ! void pclosedir (pool *p, DIR *d); /* ... even child processes (which we may want to wait for, * or to kill outright, on unexpected termination). --- 210,240 ---- * the note_cleanups_for_foo routines are for */ ! API_EXPORT(FILE *) pfopen(struct pool *, const char *name, const char *fmode); ! API_EXPORT(FILE *) pfdopen(struct pool *, int fd, const char *fmode); ! API_EXPORT(int) popenf(struct pool *, const char *name, int flg, int mode); ! ! API_EXPORT(void) note_cleanups_for_file (pool *, FILE *); ! API_EXPORT(void) note_cleanups_for_fd (pool *, int); ! API_EXPORT(void) kill_cleanups_for_fd (pool *p, int fd); ! ! API_EXPORT(void) note_cleanups_for_socket (pool *, int); ! API_EXPORT(void) kill_cleanups_for_socket (pool *p, int sock); ! API_EXPORT(int) pclosesocket(pool *a, int sock); ! API_EXPORT(regex_t *) pregcomp (pool *p, const char *pattern, int cflags); ! API_EXPORT(void) pregfree (pool *p, regex_t *reg); /* routines to note closes... file descriptors are constrained enough * on some systems that we want to support this. */ ! API_EXPORT(int) pfclose(struct pool *, FILE *); ! API_EXPORT(int) pclosef(struct pool *, int fd); /* routines to deal with directories */ ! API_EXPORT(DIR *) popendir (pool *p, const char *name); ! API_EXPORT(void) pclosedir (pool *p, DIR *d); /* ... even child processes (which we may want to wait for, * or to kill outright, on unexpected termination). *************** *** 249,255 **** enum kill_conditions { kill_never, kill_always, kill_after_timeout, just_wait, kill_only_once }; ! int spawn_child_err (pool *, int (*)(void *), void *, enum kill_conditions, FILE **pipe_in, FILE **pipe_out, FILE **pipe_err); #define spawn_child(p,f,v,k,in,out) spawn_child_err(p,f,v,k,in,out,NULL) --- 249,255 ---- enum kill_conditions { kill_never, kill_always, kill_after_timeout, just_wait, kill_only_once }; ! API_EXPORT(int) spawn_child_err (pool *, int (*)(void *), void *, enum kill_conditions, FILE **pipe_in, FILE **pipe_out, FILE **pipe_err); #define spawn_child(p,f,v,k,in,out) spawn_child_err(p,f,v,k,in,out,NULL) 1.6 +1505 -110 apache/src/apache.mak Index: apache.mak =================================================================== RCS file: /export/home/cvs/apache/src/apache.mak,v retrieving revision 1.5 retrieving revision 1.6 diff -C3 -r1.5 -r1.6 *** apache.mak 1997/07/12 13:14:44 1.5 --- apache.mak 1997/07/13 19:01:07 1.6 *************** *** 908,913 **** --- 908,916 ---- # Begin Source File SOURCE=.\buff.c + + !IF "$(CFG)" == "apache - Win32 Release" + DEP_CPP_BUFF_=\ ".\./regex\regex.h"\ ".\alloc.h"\ *************** *** 923,936 **** ".\sfio.h"\ - !IF "$(CFG)" == "apache - Win32 Release" - - "$(INTDIR)\buff.obj" : $(SOURCE) $(DEP_CPP_BUFF_) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" "$(INTDIR)\buff.obj" : $(SOURCE) $(DEP_CPP_BUFF_) "$(INTDIR)" --- 926,950 ---- ".\sfio.h"\ "$(INTDIR)\buff.obj" : $(SOURCE) $(DEP_CPP_BUFF_) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" + DEP_CPP_BUFF_=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_main.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_BUFF_=\ + ".\sfio.h"\ + "$(INTDIR)\buff.obj" : $(SOURCE) $(DEP_CPP_BUFF_) "$(INTDIR)" *************** *** 939,944 **** --- 953,969 ---- !ELSEIF "$(CFG)" == "apache - Win32 Pre" + DEP_CPP_BUFF_=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_main.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + "$(INTDIR)\buff.obj" : $(SOURCE) $(DEP_CPP_BUFF_) "$(INTDIR)" *************** *** 947,952 **** --- 972,991 ---- !ELSEIF "$(CFG)" == "apache - Win32 Profile" + DEP_CPP_BUFF_=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_main.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_BUFF_=\ + ".\sfio.h"\ + "$(INTDIR)\buff.obj" : $(SOURCE) $(DEP_CPP_BUFF_) "$(INTDIR)" *************** *** 1001,1006 **** --- 1040,1048 ---- # Begin Source File SOURCE=.\http_bprintf.c + + !IF "$(CFG)" == "apache - Win32 Release" + DEP_CPP_HTTP_=\ ".\./regex\regex.h"\ ".\alloc.h"\ *************** *** 1015,1028 **** ".\sfio.h"\ - !IF "$(CFG)" == "apache - Win32 Release" - - "$(INTDIR)\http_bprintf.obj" : $(SOURCE) $(DEP_CPP_HTTP_) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" "$(INTDIR)\http_bprintf.obj" : $(SOURCE) $(DEP_CPP_HTTP_) "$(INTDIR)" --- 1057,1080 ---- ".\sfio.h"\ "$(INTDIR)\http_bprintf.obj" : $(SOURCE) $(DEP_CPP_HTTP_) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" + DEP_CPP_HTTP_=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_HTTP_=\ + ".\sfio.h"\ + "$(INTDIR)\http_bprintf.obj" : $(SOURCE) $(DEP_CPP_HTTP_) "$(INTDIR)" *************** *** 1031,1036 **** --- 1083,1098 ---- !ELSEIF "$(CFG)" == "apache - Win32 Pre" + DEP_CPP_HTTP_=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + "$(INTDIR)\http_bprintf.obj" : $(SOURCE) $(DEP_CPP_HTTP_) "$(INTDIR)" *************** *** 1039,1044 **** --- 1101,1119 ---- !ELSEIF "$(CFG)" == "apache - Win32 Profile" + DEP_CPP_HTTP_=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_HTTP_=\ + ".\sfio.h"\ + "$(INTDIR)\http_bprintf.obj" : $(SOURCE) $(DEP_CPP_HTTP_) "$(INTDIR)" *************** *** 1052,1057 **** --- 1127,1135 ---- # Begin Source File SOURCE=.\http_config.c + + !IF "$(CFG)" == "apache - Win32 Release" + DEP_CPP_HTTP_C=\ ".\./regex\regex.h"\ ".\alloc.h"\ *************** *** 1072,1085 **** ".\sfio.h"\ - !IF "$(CFG)" == "apache - Win32 Release" - - "$(INTDIR)\http_config.obj" : $(SOURCE) $(DEP_CPP_HTTP_C) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" "$(INTDIR)\http_config.obj" : $(SOURCE) $(DEP_CPP_HTTP_C) "$(INTDIR)" --- 1150,1179 ---- ".\sfio.h"\ "$(INTDIR)\http_config.obj" : $(SOURCE) $(DEP_CPP_HTTP_C) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" + DEP_CPP_HTTP_C=\ + ".\./regex\regex.h"\ + ".\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"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_HTTP_C=\ + ".\sfio.h"\ + "$(INTDIR)\http_config.obj" : $(SOURCE) $(DEP_CPP_HTTP_C) "$(INTDIR)" *************** *** 1088,1093 **** --- 1182,1203 ---- !ELSEIF "$(CFG)" == "apache - Win32 Pre" + DEP_CPP_HTTP_C=\ + ".\./regex\regex.h"\ + ".\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"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + "$(INTDIR)\http_config.obj" : $(SOURCE) $(DEP_CPP_HTTP_C) "$(INTDIR)" *************** *** 1096,1101 **** --- 1206,1230 ---- !ELSEIF "$(CFG)" == "apache - Win32 Profile" + DEP_CPP_HTTP_C=\ + ".\./regex\regex.h"\ + ".\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"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_HTTP_C=\ + ".\sfio.h"\ + "$(INTDIR)\http_config.obj" : $(SOURCE) $(DEP_CPP_HTTP_C) "$(INTDIR)" *************** *** 1109,1114 **** --- 1238,1246 ---- # Begin Source File SOURCE=.\http_core.c + + !IF "$(CFG)" == "apache - Win32 Release" + DEP_CPP_HTTP_CO=\ ".\./regex\regex.h"\ ".\alloc.h"\ *************** *** 1133,1146 **** ".\sfio.h"\ - !IF "$(CFG)" == "apache - Win32 Release" - - "$(INTDIR)\http_core.obj" : $(SOURCE) $(DEP_CPP_HTTP_CO) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" "$(INTDIR)\http_core.obj" : $(SOURCE) $(DEP_CPP_HTTP_CO) "$(INTDIR)" --- 1265,1298 ---- ".\sfio.h"\ "$(INTDIR)\http_core.obj" : $(SOURCE) $(DEP_CPP_HTTP_CO) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" + DEP_CPP_HTTP_CO=\ + ".\./regex\regex.h"\ + ".\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"\ + ".\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)" *************** *** 1149,1154 **** --- 1301,1326 ---- !ELSEIF "$(CFG)" == "apache - Win32 Pre" + DEP_CPP_HTTP_CO=\ + ".\./regex\regex.h"\ + ".\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"\ + ".\rfc1413.h"\ + ".\scoreboard.h"\ + ".\util_md5.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + "$(INTDIR)\http_core.obj" : $(SOURCE) $(DEP_CPP_HTTP_CO) "$(INTDIR)" *************** *** 1157,1162 **** --- 1329,1357 ---- !ELSEIF "$(CFG)" == "apache - Win32 Profile" + DEP_CPP_HTTP_CO=\ + ".\./regex\regex.h"\ + ".\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"\ + ".\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)" *************** *** 1170,1175 **** --- 1365,1373 ---- # Begin Source File SOURCE=.\http_log.c + + !IF "$(CFG)" == "apache - Win32 Release" + DEP_CPP_HTTP_L=\ ".\./regex\regex.h"\ ".\alloc.h"\ *************** *** 1187,1200 **** ".\sfio.h"\ - !IF "$(CFG)" == "apache - Win32 Release" - - "$(INTDIR)\http_log.obj" : $(SOURCE) $(DEP_CPP_HTTP_L) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" "$(INTDIR)\http_log.obj" : $(SOURCE) $(DEP_CPP_HTTP_L) "$(INTDIR)" --- 1385,1411 ---- ".\sfio.h"\ "$(INTDIR)\http_log.obj" : $(SOURCE) $(DEP_CPP_HTTP_L) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" + DEP_CPP_HTTP_L=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_config.h"\ + ".\http_core.h"\ + ".\http_log.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_HTTP_L=\ + ".\sfio.h"\ + "$(INTDIR)\http_log.obj" : $(SOURCE) $(DEP_CPP_HTTP_L) "$(INTDIR)" *************** *** 1203,1208 **** --- 1414,1432 ---- !ELSEIF "$(CFG)" == "apache - Win32 Pre" + DEP_CPP_HTTP_L=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_config.h"\ + ".\http_core.h"\ + ".\http_log.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + "$(INTDIR)\http_log.obj" : $(SOURCE) $(DEP_CPP_HTTP_L) "$(INTDIR)" *************** *** 1211,1219 **** !ELSEIF "$(CFG)" == "apache - Win32 Profile" - "$(INTDIR)\http_log.obj" : $(SOURCE) $(DEP_CPP_HTTP_L) "$(INTDIR)" - "$(INTDIR)\http_log.sbr" : $(SOURCE) $(DEP_CPP_HTTP_L) "$(INTDIR)" --- 1435,1459 ---- !ELSEIF "$(CFG)" == "apache - Win32 Profile" + DEP_CPP_HTTP_L=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_config.h"\ + ".\http_core.h"\ + ".\http_log.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_HTTP_L=\ + ".\sfio.h"\ + + + "$(INTDIR)\http_log.obj" : $(SOURCE) $(DEP_CPP_HTTP_L) "$(INTDIR)" "$(INTDIR)\http_log.sbr" : $(SOURCE) $(DEP_CPP_HTTP_L) "$(INTDIR)" *************** *** 1224,1229 **** --- 1464,1472 ---- # Begin Source File SOURCE=.\http_main.c + + !IF "$(CFG)" == "apache - Win32 Release" + DEP_CPP_HTTP_M=\ ".\./regex\regex.h"\ ".\alloc.h"\ *************** *** 1250,1263 **** ".\sfio.h"\ - !IF "$(CFG)" == "apache - Win32 Release" - - "$(INTDIR)\http_main.obj" : $(SOURCE) $(DEP_CPP_HTTP_M) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" "$(INTDIR)\http_main.obj" : $(SOURCE) $(DEP_CPP_HTTP_M) "$(INTDIR)" --- 1493,1528 ---- ".\sfio.h"\ "$(INTDIR)\http_main.obj" : $(SOURCE) $(DEP_CPP_HTTP_M) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" + DEP_CPP_HTTP_M=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\explain.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"\ + ".\multithread.h"\ + ".\nt\getopt.h"\ + ".\nt\readdir.h"\ + ".\nt\service.h"\ + ".\scoreboard.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_HTTP_M=\ + ".\sfio.h"\ + "$(INTDIR)\http_main.obj" : $(SOURCE) $(DEP_CPP_HTTP_M) "$(INTDIR)" *************** *** 1266,1271 **** --- 1531,1558 ---- !ELSEIF "$(CFG)" == "apache - Win32 Pre" + DEP_CPP_HTTP_M=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\explain.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"\ + ".\multithread.h"\ + ".\nt\getopt.h"\ + ".\nt\readdir.h"\ + ".\nt\service.h"\ + ".\scoreboard.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + "$(INTDIR)\http_main.obj" : $(SOURCE) $(DEP_CPP_HTTP_M) "$(INTDIR)" *************** *** 1274,1279 **** --- 1561,1591 ---- !ELSEIF "$(CFG)" == "apache - Win32 Profile" + DEP_CPP_HTTP_M=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\explain.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"\ + ".\multithread.h"\ + ".\nt\getopt.h"\ + ".\nt\readdir.h"\ + ".\nt\service.h"\ + ".\scoreboard.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_HTTP_M=\ + ".\sfio.h"\ + "$(INTDIR)\http_main.obj" : $(SOURCE) $(DEP_CPP_HTTP_M) "$(INTDIR)" *************** *** 1287,1292 **** --- 1599,1607 ---- # Begin Source File SOURCE=.\http_protocol.c + + !IF "$(CFG)" == "apache - Win32 Release" + DEP_CPP_HTTP_P=\ ".\./regex\regex.h"\ ".\alloc.h"\ *************** *** 1307,1320 **** ".\sfio.h"\ - !IF "$(CFG)" == "apache - Win32 Release" - - "$(INTDIR)\http_protocol.obj" : $(SOURCE) $(DEP_CPP_HTTP_P) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" "$(INTDIR)\http_protocol.obj" : $(SOURCE) $(DEP_CPP_HTTP_P) "$(INTDIR)" --- 1622,1651 ---- ".\sfio.h"\ "$(INTDIR)\http_protocol.obj" : $(SOURCE) $(DEP_CPP_HTTP_P) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" + DEP_CPP_HTTP_P=\ + ".\./regex\regex.h"\ + ".\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"\ + ".\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)" *************** *** 1323,1328 **** --- 1654,1675 ---- !ELSEIF "$(CFG)" == "apache - Win32 Pre" + DEP_CPP_HTTP_P=\ + ".\./regex\regex.h"\ + ".\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"\ + ".\util_date.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + "$(INTDIR)\http_protocol.obj" : $(SOURCE) $(DEP_CPP_HTTP_P) "$(INTDIR)" *************** *** 1331,1336 **** --- 1678,1702 ---- !ELSEIF "$(CFG)" == "apache - Win32 Profile" + DEP_CPP_HTTP_P=\ + ".\./regex\regex.h"\ + ".\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"\ + ".\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)" *************** *** 1344,1349 **** --- 1710,1718 ---- # Begin Source File SOURCE=.\http_request.c + + !IF "$(CFG)" == "apache - Win32 Release" + DEP_CPP_HTTP_R=\ ".\./regex\regex.h"\ ".\alloc.h"\ *************** *** 1365,1378 **** ".\sfio.h"\ - !IF "$(CFG)" == "apache - Win32 Release" - - "$(INTDIR)\http_request.obj" : $(SOURCE) $(DEP_CPP_HTTP_R) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" "$(INTDIR)\http_request.obj" : $(SOURCE) $(DEP_CPP_HTTP_R) "$(INTDIR)" --- 1734,1764 ---- ".\sfio.h"\ "$(INTDIR)\http_request.obj" : $(SOURCE) $(DEP_CPP_HTTP_R) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" + DEP_CPP_HTTP_R=\ + ".\./regex\regex.h"\ + ".\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"\ + ".\nt\readdir.h"\ + ".\scoreboard.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_HTTP_R=\ + ".\sfio.h"\ + "$(INTDIR)\http_request.obj" : $(SOURCE) $(DEP_CPP_HTTP_R) "$(INTDIR)" *************** *** 1381,1386 **** --- 1767,1789 ---- !ELSEIF "$(CFG)" == "apache - Win32 Pre" + DEP_CPP_HTTP_R=\ + ".\./regex\regex.h"\ + ".\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"\ + ".\nt\readdir.h"\ + ".\scoreboard.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + "$(INTDIR)\http_request.obj" : $(SOURCE) $(DEP_CPP_HTTP_R) "$(INTDIR)" *************** *** 1389,1394 **** --- 1792,1817 ---- !ELSEIF "$(CFG)" == "apache - Win32 Profile" + DEP_CPP_HTTP_R=\ + ".\./regex\regex.h"\ + ".\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"\ + ".\nt\readdir.h"\ + ".\scoreboard.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_HTTP_R=\ + ".\sfio.h"\ + "$(INTDIR)\http_request.obj" : $(SOURCE) $(DEP_CPP_HTTP_R) "$(INTDIR)" *************** *** 1443,1448 **** --- 1866,1874 ---- # Begin Source File SOURCE=.\mod_access.c + + !IF "$(CFG)" == "apache - Win32 Release" + DEP_CPP_MOD_A=\ ".\./regex\regex.h"\ ".\alloc.h"\ *************** *** 1461,1474 **** ".\sfio.h"\ - !IF "$(CFG)" == "apache - Win32 Release" - - "$(INTDIR)\mod_access.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" "$(INTDIR)\mod_access.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)" --- 1887,1914 ---- ".\sfio.h"\ "$(INTDIR)\mod_access.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" + DEP_CPP_MOD_A=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_config.h"\ + ".\http_core.h"\ + ".\http_log.h"\ + ".\http_request.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_MOD_A=\ + ".\sfio.h"\ + "$(INTDIR)\mod_access.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)" *************** *** 1477,1482 **** --- 1917,1936 ---- !ELSEIF "$(CFG)" == "apache - Win32 Pre" + DEP_CPP_MOD_A=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_config.h"\ + ".\http_core.h"\ + ".\http_log.h"\ + ".\http_request.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + "$(INTDIR)\mod_access.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)" *************** *** 1485,1490 **** --- 1939,1961 ---- !ELSEIF "$(CFG)" == "apache - Win32 Profile" + DEP_CPP_MOD_A=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_config.h"\ + ".\http_core.h"\ + ".\http_log.h"\ + ".\http_request.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_MOD_A=\ + ".\sfio.h"\ + "$(INTDIR)\mod_access.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)" *************** *** 1498,1503 **** --- 1969,1977 ---- # Begin Source File SOURCE=.\mod_actions.c + + !IF "$(CFG)" == "apache - Win32 Release" + DEP_CPP_MOD_AC=\ ".\./regex\regex.h"\ ".\alloc.h"\ *************** *** 1519,1532 **** ".\sfio.h"\ - !IF "$(CFG)" == "apache - Win32 Release" - - "$(INTDIR)\mod_actions.obj" : $(SOURCE) $(DEP_CPP_MOD_AC) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" "$(INTDIR)\mod_actions.obj" : $(SOURCE) $(DEP_CPP_MOD_AC) "$(INTDIR)" --- 1993,2023 ---- ".\sfio.h"\ "$(INTDIR)\mod_actions.obj" : $(SOURCE) $(DEP_CPP_MOD_AC) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" + DEP_CPP_MOD_AC=\ + ".\./regex\regex.h"\ + ".\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"\ + ".\nt\readdir.h"\ + ".\util_script.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_MOD_AC=\ + ".\sfio.h"\ + "$(INTDIR)\mod_actions.obj" : $(SOURCE) $(DEP_CPP_MOD_AC) "$(INTDIR)" *************** *** 1535,1540 **** --- 2026,2048 ---- !ELSEIF "$(CFG)" == "apache - Win32 Pre" + DEP_CPP_MOD_AC=\ + ".\./regex\regex.h"\ + ".\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"\ + ".\nt\readdir.h"\ + ".\util_script.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + "$(INTDIR)\mod_actions.obj" : $(SOURCE) $(DEP_CPP_MOD_AC) "$(INTDIR)" *************** *** 1543,1548 **** --- 2051,2076 ---- !ELSEIF "$(CFG)" == "apache - Win32 Profile" + DEP_CPP_MOD_AC=\ + ".\./regex\regex.h"\ + ".\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"\ + ".\nt\readdir.h"\ + ".\util_script.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_MOD_AC=\ + ".\sfio.h"\ + "$(INTDIR)\mod_actions.obj" : $(SOURCE) $(DEP_CPP_MOD_AC) "$(INTDIR)" *************** *** 1556,1561 **** --- 2084,2092 ---- # Begin Source File SOURCE=.\mod_alias.c + + !IF "$(CFG)" == "apache - Win32 Release" + DEP_CPP_MOD_AL=\ ".\./regex\regex.h"\ ".\alloc.h"\ *************** *** 1571,1584 **** ".\sfio.h"\ - !IF "$(CFG)" == "apache - Win32 Release" - - "$(INTDIR)\mod_alias.obj" : $(SOURCE) $(DEP_CPP_MOD_AL) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" "$(INTDIR)\mod_alias.obj" : $(SOURCE) $(DEP_CPP_MOD_AL) "$(INTDIR)" --- 2102,2126 ---- ".\sfio.h"\ "$(INTDIR)\mod_alias.obj" : $(SOURCE) $(DEP_CPP_MOD_AL) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" + DEP_CPP_MOD_AL=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_config.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_MOD_AL=\ + ".\sfio.h"\ + "$(INTDIR)\mod_alias.obj" : $(SOURCE) $(DEP_CPP_MOD_AL) "$(INTDIR)" *************** *** 1587,1592 **** --- 2129,2145 ---- !ELSEIF "$(CFG)" == "apache - Win32 Pre" + DEP_CPP_MOD_AL=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_config.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + "$(INTDIR)\mod_alias.obj" : $(SOURCE) $(DEP_CPP_MOD_AL) "$(INTDIR)" *************** *** 1595,1600 **** --- 2148,2167 ---- !ELSEIF "$(CFG)" == "apache - Win32 Profile" + DEP_CPP_MOD_AL=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_config.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_MOD_AL=\ + ".\sfio.h"\ + "$(INTDIR)\mod_alias.obj" : $(SOURCE) $(DEP_CPP_MOD_AL) "$(INTDIR)" *************** *** 1608,1613 **** --- 2175,2183 ---- # Begin Source File SOURCE=.\mod_asis.c + + !IF "$(CFG)" == "apache - Win32 Release" + DEP_CPP_MOD_AS=\ ".\./regex\regex.h"\ ".\alloc.h"\ *************** *** 1628,1641 **** ".\sfio.h"\ - !IF "$(CFG)" == "apache - Win32 Release" - - "$(INTDIR)\mod_asis.obj" : $(SOURCE) $(DEP_CPP_MOD_AS) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" "$(INTDIR)\mod_asis.obj" : $(SOURCE) $(DEP_CPP_MOD_AS) "$(INTDIR)" --- 2198,2227 ---- ".\sfio.h"\ "$(INTDIR)\mod_asis.obj" : $(SOURCE) $(DEP_CPP_MOD_AS) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" + DEP_CPP_MOD_AS=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_config.h"\ + ".\http_log.h"\ + ".\http_main.h"\ + ".\http_protocol.h"\ + ".\http_request.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + ".\util_script.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_MOD_AS=\ + ".\sfio.h"\ + "$(INTDIR)\mod_asis.obj" : $(SOURCE) $(DEP_CPP_MOD_AS) "$(INTDIR)" *************** *** 1644,1649 **** --- 2230,2251 ---- !ELSEIF "$(CFG)" == "apache - Win32 Pre" + DEP_CPP_MOD_AS=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_config.h"\ + ".\http_log.h"\ + ".\http_main.h"\ + ".\http_protocol.h"\ + ".\http_request.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + ".\util_script.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + "$(INTDIR)\mod_asis.obj" : $(SOURCE) $(DEP_CPP_MOD_AS) "$(INTDIR)" *************** *** 1652,1657 **** --- 2254,2278 ---- !ELSEIF "$(CFG)" == "apache - Win32 Profile" + DEP_CPP_MOD_AS=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_config.h"\ + ".\http_log.h"\ + ".\http_main.h"\ + ".\http_protocol.h"\ + ".\http_request.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + ".\util_script.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_MOD_AS=\ + ".\sfio.h"\ + "$(INTDIR)\mod_asis.obj" : $(SOURCE) $(DEP_CPP_MOD_AS) "$(INTDIR)" *************** *** 1665,1670 **** --- 2286,2294 ---- # Begin Source File SOURCE=.\mod_auth.c + + !IF "$(CFG)" == "apache - Win32 Release" + DEP_CPP_MOD_AU=\ ".\./regex\regex.h"\ ".\alloc.h"\ *************** *** 1683,1696 **** ".\sfio.h"\ - !IF "$(CFG)" == "apache - Win32 Release" - - "$(INTDIR)\mod_auth.obj" : $(SOURCE) $(DEP_CPP_MOD_AU) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" "$(INTDIR)\mod_auth.obj" : $(SOURCE) $(DEP_CPP_MOD_AU) "$(INTDIR)" --- 2307,2334 ---- ".\sfio.h"\ "$(INTDIR)\mod_auth.obj" : $(SOURCE) $(DEP_CPP_MOD_AU) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" + DEP_CPP_MOD_AU=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_config.h"\ + ".\http_core.h"\ + ".\http_log.h"\ + ".\http_protocol.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_MOD_AU=\ + ".\sfio.h"\ + "$(INTDIR)\mod_auth.obj" : $(SOURCE) $(DEP_CPP_MOD_AU) "$(INTDIR)" *************** *** 1699,1704 **** --- 2337,2356 ---- !ELSEIF "$(CFG)" == "apache - Win32 Pre" + DEP_CPP_MOD_AU=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_config.h"\ + ".\http_core.h"\ + ".\http_log.h"\ + ".\http_protocol.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + "$(INTDIR)\mod_auth.obj" : $(SOURCE) $(DEP_CPP_MOD_AU) "$(INTDIR)" *************** *** 1707,1712 **** --- 2359,2381 ---- !ELSEIF "$(CFG)" == "apache - Win32 Profile" + DEP_CPP_MOD_AU=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_config.h"\ + ".\http_core.h"\ + ".\http_log.h"\ + ".\http_protocol.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_MOD_AU=\ + ".\sfio.h"\ + "$(INTDIR)\mod_auth.obj" : $(SOURCE) $(DEP_CPP_MOD_AU) "$(INTDIR)" *************** *** 1720,1725 **** --- 2389,2397 ---- # Begin Source File SOURCE=.\alloc.c + + !IF "$(CFG)" == "apache - Win32 Release" + DEP_CPP_ALLOC=\ ".\./regex\regex.h"\ ".\alloc.h"\ *************** *** 1735,1764 **** ".\sfio.h"\ - !IF "$(CFG)" == "apache - Win32 Release" - - "$(INTDIR)\alloc.obj" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" ! ! "$(INTDIR)\alloc.obj" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)" ! ! "$(INTDIR)\alloc.sbr" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)" ! ! ! !ELSEIF "$(CFG)" == "apache - Win32 Pre" ! ! ! "$(INTDIR)\alloc.obj" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)" ! "$(INTDIR)\alloc.sbr" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Profile" "$(INTDIR)\alloc.obj" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)" --- 2407,2472 ---- ".\sfio.h"\ "$(INTDIR)\alloc.obj" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" ! DEP_CPP_ALLOC=\ ! ".\./regex\regex.h"\ ! ".\alloc.h"\ ! ".\buff.h"\ ! ".\conf.h"\ ! ".\httpd.h"\ ! ".\multithread.h"\ ! ".\nt\readdir.h"\ ! {$(INCLUDE)}"\sys\STAT.H"\ ! {$(INCLUDE)}"\sys\TYPES.H"\ ! ! NODEP_CPP_ALLOC=\ ! ".\sfio.h"\ ! ! ! "$(INTDIR)\alloc.obj" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)" ! ! "$(INTDIR)\alloc.sbr" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)" ! ! ! !ELSEIF "$(CFG)" == "apache - Win32 Pre" ! ! DEP_CPP_ALLOC=\ ! ".\./regex\regex.h"\ ! ".\alloc.h"\ ! ".\buff.h"\ ! ".\conf.h"\ ! ".\httpd.h"\ ! ".\multithread.h"\ ! ".\nt\readdir.h"\ ! {$(INCLUDE)}"\sys\STAT.H"\ ! {$(INCLUDE)}"\sys\TYPES.H"\ ! ! ! "$(INTDIR)\alloc.obj" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)" ! "$(INTDIR)\alloc.sbr" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Profile" + DEP_CPP_ALLOC=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\httpd.h"\ + ".\multithread.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_ALLOC=\ + ".\sfio.h"\ + "$(INTDIR)\alloc.obj" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)" *************** *** 1772,1777 **** --- 2480,2488 ---- # Begin Source File SOURCE=.\util_script.c + + !IF "$(CFG)" == "apache - Win32 Release" + DEP_CPP_UTIL_S=\ ".\./regex\regex.h"\ ".\alloc.h"\ *************** *** 1794,1807 **** ".\sfio.h"\ - !IF "$(CFG)" == "apache - Win32 Release" - - "$(INTDIR)\util_script.obj" : $(SOURCE) $(DEP_CPP_UTIL_S) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" "$(INTDIR)\util_script.obj" : $(SOURCE) $(DEP_CPP_UTIL_S) "$(INTDIR)" --- 2505,2536 ---- ".\sfio.h"\ "$(INTDIR)\util_script.obj" : $(SOURCE) $(DEP_CPP_UTIL_S) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" + DEP_CPP_UTIL_S=\ + ".\./regex\regex.h"\ + ".\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"\ + ".\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)" *************** *** 1810,1815 **** --- 2539,2562 ---- !ELSEIF "$(CFG)" == "apache - Win32 Pre" + DEP_CPP_UTIL_S=\ + ".\./regex\regex.h"\ + ".\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"\ + ".\util_script.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + "$(INTDIR)\util_script.obj" : $(SOURCE) $(DEP_CPP_UTIL_S) "$(INTDIR)" *************** *** 1818,1823 **** --- 2565,2591 ---- !ELSEIF "$(CFG)" == "apache - Win32 Profile" + DEP_CPP_UTIL_S=\ + ".\./regex\regex.h"\ + ".\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"\ + ".\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)" *************** *** 1831,1836 **** --- 2599,2607 ---- # Begin Source File SOURCE=.\mod_cgi.c + + !IF "$(CFG)" == "apache - Win32 Release" + DEP_CPP_MOD_C=\ ".\./regex\regex.h"\ ".\alloc.h"\ *************** *** 1853,1866 **** ".\sfio.h"\ - !IF "$(CFG)" == "apache - Win32 Release" - - "$(INTDIR)\mod_cgi.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" "$(INTDIR)\mod_cgi.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)" --- 2624,2655 ---- ".\sfio.h"\ "$(INTDIR)\mod_cgi.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" + DEP_CPP_MOD_C=\ + ".\./regex\regex.h"\ + ".\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"\ + ".\util_script.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_MOD_C=\ + ".\sfio.h"\ + "$(INTDIR)\mod_cgi.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)" *************** *** 1869,1874 **** --- 2658,2681 ---- !ELSEIF "$(CFG)" == "apache - Win32 Pre" + DEP_CPP_MOD_C=\ + ".\./regex\regex.h"\ + ".\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"\ + ".\util_script.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + "$(INTDIR)\mod_cgi.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)" *************** *** 1877,1882 **** --- 2684,2710 ---- !ELSEIF "$(CFG)" == "apache - Win32 Profile" + DEP_CPP_MOD_C=\ + ".\./regex\regex.h"\ + ".\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"\ + ".\util_script.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_MOD_C=\ + ".\sfio.h"\ + "$(INTDIR)\mod_cgi.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)" *************** *** 1890,1895 **** --- 2718,2726 ---- # Begin Source File SOURCE=.\mod_dir.c + + !IF "$(CFG)" == "apache - Win32 Release" + DEP_CPP_MOD_D=\ ".\./regex\regex.h"\ ".\alloc.h"\ *************** *** 1911,1924 **** ".\sfio.h"\ - !IF "$(CFG)" == "apache - Win32 Release" - - "$(INTDIR)\mod_dir.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" "$(INTDIR)\mod_dir.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)" --- 2742,2772 ---- ".\sfio.h"\ "$(INTDIR)\mod_dir.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" + DEP_CPP_MOD_D=\ + ".\./regex\regex.h"\ + ".\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"\ + ".\nt\readdir.h"\ + ".\util_script.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_MOD_D=\ + ".\sfio.h"\ + "$(INTDIR)\mod_dir.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)" *************** *** 1927,1932 **** --- 2775,2797 ---- !ELSEIF "$(CFG)" == "apache - Win32 Pre" + DEP_CPP_MOD_D=\ + ".\./regex\regex.h"\ + ".\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"\ + ".\nt\readdir.h"\ + ".\util_script.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + "$(INTDIR)\mod_dir.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)" *************** *** 1935,1940 **** --- 2800,2825 ---- !ELSEIF "$(CFG)" == "apache - Win32 Profile" + DEP_CPP_MOD_D=\ + ".\./regex\regex.h"\ + ".\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"\ + ".\nt\readdir.h"\ + ".\util_script.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_MOD_D=\ + ".\sfio.h"\ + "$(INTDIR)\mod_dir.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)" *************** *** 1948,1953 **** --- 2833,2841 ---- # Begin Source File SOURCE=.\mod_env.c + + !IF "$(CFG)" == "apache - Win32 Release" + DEP_CPP_MOD_E=\ ".\./regex\regex.h"\ ".\alloc.h"\ *************** *** 1963,1976 **** ".\sfio.h"\ - !IF "$(CFG)" == "apache - Win32 Release" - - "$(INTDIR)\mod_env.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" "$(INTDIR)\mod_env.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)" --- 2851,2875 ---- ".\sfio.h"\ "$(INTDIR)\mod_env.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" + DEP_CPP_MOD_E=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_config.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_MOD_E=\ + ".\sfio.h"\ + "$(INTDIR)\mod_env.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)" *************** *** 1979,1984 **** --- 2878,2894 ---- !ELSEIF "$(CFG)" == "apache - Win32 Pre" + DEP_CPP_MOD_E=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_config.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + "$(INTDIR)\mod_env.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)" *************** *** 1987,1992 **** --- 2897,2916 ---- !ELSEIF "$(CFG)" == "apache - Win32 Profile" + DEP_CPP_MOD_E=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_config.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_MOD_E=\ + ".\sfio.h"\ + "$(INTDIR)\mod_env.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)" *************** *** 2000,2005 **** --- 2924,2932 ---- # Begin Source File SOURCE=.\mod_imap.c + + !IF "$(CFG)" == "apache - Win32 Release" + DEP_CPP_MOD_I=\ ".\./regex\regex.h"\ ".\alloc.h"\ *************** *** 2021,2034 **** ".\sfio.h"\ - !IF "$(CFG)" == "apache - Win32 Release" - - "$(INTDIR)\mod_imap.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" "$(INTDIR)\mod_imap.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)" --- 2948,2978 ---- ".\sfio.h"\ "$(INTDIR)\mod_imap.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" + DEP_CPP_MOD_I=\ + ".\./regex\regex.h"\ + ".\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"\ + ".\nt\readdir.h"\ + ".\util_script.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_MOD_I=\ + ".\sfio.h"\ + "$(INTDIR)\mod_imap.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)" *************** *** 2037,2042 **** --- 2981,3003 ---- !ELSEIF "$(CFG)" == "apache - Win32 Pre" + DEP_CPP_MOD_I=\ + ".\./regex\regex.h"\ + ".\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"\ + ".\nt\readdir.h"\ + ".\util_script.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + "$(INTDIR)\mod_imap.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)" *************** *** 2045,2050 **** --- 3006,3031 ---- !ELSEIF "$(CFG)" == "apache - Win32 Profile" + DEP_CPP_MOD_I=\ + ".\./regex\regex.h"\ + ".\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"\ + ".\nt\readdir.h"\ + ".\util_script.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_MOD_I=\ + ".\sfio.h"\ + "$(INTDIR)\mod_imap.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)" *************** *** 2058,2063 **** --- 3039,3047 ---- # Begin Source File SOURCE=.\mod_include.c + + !IF "$(CFG)" == "apache - Win32 Release" + DEP_CPP_MOD_IN=\ ".\./regex\regex.h"\ ".\alloc.h"\ *************** *** 2081,2094 **** ".\sfio.h"\ - !IF "$(CFG)" == "apache - Win32 Release" - - "$(INTDIR)\mod_include.obj" : $(SOURCE) $(DEP_CPP_MOD_IN) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" "$(INTDIR)\mod_include.obj" : $(SOURCE) $(DEP_CPP_MOD_IN) "$(INTDIR)" --- 3065,3097 ---- ".\sfio.h"\ "$(INTDIR)\mod_include.obj" : $(SOURCE) $(DEP_CPP_MOD_IN) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" + DEP_CPP_MOD_IN=\ + ".\./regex\regex.h"\ + ".\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"\ + ".\nt\readdir.h"\ + ".\util_script.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_MOD_IN=\ + ".\config.h"\ + ".\modules\perl\mod_perl.h"\ + ".\sfio.h"\ + "$(INTDIR)\mod_include.obj" : $(SOURCE) $(DEP_CPP_MOD_IN) "$(INTDIR)" *************** *** 2097,2102 **** --- 3100,3126 ---- !ELSEIF "$(CFG)" == "apache - Win32 Pre" + DEP_CPP_MOD_IN=\ + ".\./regex\regex.h"\ + ".\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"\ + ".\nt\readdir.h"\ + ".\util_script.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_MOD_IN=\ + ".\config.h"\ + ".\modules\perl\mod_perl.h"\ + "$(INTDIR)\mod_include.obj" : $(SOURCE) $(DEP_CPP_MOD_IN) "$(INTDIR)" *************** *** 2105,2110 **** --- 3129,3156 ---- !ELSEIF "$(CFG)" == "apache - Win32 Profile" + DEP_CPP_MOD_IN=\ + ".\./regex\regex.h"\ + ".\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"\ + ".\nt\readdir.h"\ + ".\util_script.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_MOD_IN=\ + ".\config.h"\ + ".\modules\perl\mod_perl.h"\ + ".\sfio.h"\ + "$(INTDIR)\mod_include.obj" : $(SOURCE) $(DEP_CPP_MOD_IN) "$(INTDIR)" *************** *** 2118,2123 **** --- 3164,3172 ---- # Begin Source File SOURCE=.\mod_log_config.c + + !IF "$(CFG)" == "apache - Win32 Release" + DEP_CPP_MOD_L=\ ".\./regex\regex.h"\ ".\alloc.h"\ *************** *** 2134,2147 **** ".\sfio.h"\ - !IF "$(CFG)" == "apache - Win32 Release" - - "$(INTDIR)\mod_log_config.obj" : $(SOURCE) $(DEP_CPP_MOD_L) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" "$(INTDIR)\mod_log_config.obj" : $(SOURCE) $(DEP_CPP_MOD_L) "$(INTDIR)" --- 3183,3208 ---- ".\sfio.h"\ "$(INTDIR)\mod_log_config.obj" : $(SOURCE) $(DEP_CPP_MOD_L) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" + DEP_CPP_MOD_L=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_config.h"\ + ".\http_core.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_MOD_L=\ + ".\sfio.h"\ + "$(INTDIR)\mod_log_config.obj" : $(SOURCE) $(DEP_CPP_MOD_L) "$(INTDIR)" *************** *** 2150,2155 **** --- 3211,3228 ---- !ELSEIF "$(CFG)" == "apache - Win32 Pre" + DEP_CPP_MOD_L=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_config.h"\ + ".\http_core.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + "$(INTDIR)\mod_log_config.obj" : $(SOURCE) $(DEP_CPP_MOD_L) "$(INTDIR)" *************** *** 2158,2163 **** --- 3231,3251 ---- !ELSEIF "$(CFG)" == "apache - Win32 Profile" + DEP_CPP_MOD_L=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_config.h"\ + ".\http_core.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_MOD_L=\ + ".\sfio.h"\ + "$(INTDIR)\mod_log_config.obj" : $(SOURCE) $(DEP_CPP_MOD_L) "$(INTDIR)" *************** *** 2171,2176 **** --- 3259,3267 ---- # Begin Source File SOURCE=.\mod_mime.c + + !IF "$(CFG)" == "apache - Win32 Release" + DEP_CPP_MOD_M=\ ".\./regex\regex.h"\ ".\alloc.h"\ *************** *** 2186,2199 **** ".\sfio.h"\ - !IF "$(CFG)" == "apache - Win32 Release" - - "$(INTDIR)\mod_mime.obj" : $(SOURCE) $(DEP_CPP_MOD_M) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" "$(INTDIR)\mod_mime.obj" : $(SOURCE) $(DEP_CPP_MOD_M) "$(INTDIR)" --- 3277,3301 ---- ".\sfio.h"\ "$(INTDIR)\mod_mime.obj" : $(SOURCE) $(DEP_CPP_MOD_M) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" + DEP_CPP_MOD_M=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_config.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_MOD_M=\ + ".\sfio.h"\ + "$(INTDIR)\mod_mime.obj" : $(SOURCE) $(DEP_CPP_MOD_M) "$(INTDIR)" *************** *** 2202,2207 **** --- 3304,3320 ---- !ELSEIF "$(CFG)" == "apache - Win32 Pre" + DEP_CPP_MOD_M=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_config.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + "$(INTDIR)\mod_mime.obj" : $(SOURCE) $(DEP_CPP_MOD_M) "$(INTDIR)" *************** *** 2210,2215 **** --- 3323,3342 ---- !ELSEIF "$(CFG)" == "apache - Win32 Profile" + DEP_CPP_MOD_M=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_config.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_MOD_M=\ + ".\sfio.h"\ + "$(INTDIR)\mod_mime.obj" : $(SOURCE) $(DEP_CPP_MOD_M) "$(INTDIR)" *************** *** 2241,2246 **** --- 3368,3376 ---- {$(INCLUDE)}"\sys\STAT.H"\ {$(INCLUDE)}"\sys\TYPES.H"\ + NODEP_CPP_MOD_N=\ + ".\sfio.h"\ + "$(INTDIR)\mod_negotiation.obj" : $(SOURCE) $(DEP_CPP_MOD_N) "$(INTDIR)" *************** *** 2262,2267 **** --- 3392,3400 ---- {$(INCLUDE)}"\sys\STAT.H"\ {$(INCLUDE)}"\sys\TYPES.H"\ + NODEP_CPP_MOD_N=\ + ".\sfio.h"\ + "$(INTDIR)\mod_negotiation.obj" : $(SOURCE) $(DEP_CPP_MOD_N) "$(INTDIR)" *************** *** 2285,2293 **** {$(INCLUDE)}"\sys\STAT.H"\ {$(INCLUDE)}"\sys\TYPES.H"\ - NODEP_CPP_MOD_N=\ - ".\sfio.h"\ - "$(INTDIR)\mod_negotiation.obj" : $(SOURCE) $(DEP_CPP_MOD_N) "$(INTDIR)" --- 3418,3423 ---- *************** *** 2327,2332 **** --- 3457,3465 ---- # Begin Source File SOURCE=.\mod_userdir.c + + !IF "$(CFG)" == "apache - Win32 Release" + DEP_CPP_MOD_U=\ ".\./regex\regex.h"\ ".\alloc.h"\ *************** *** 2342,2355 **** ".\sfio.h"\ - !IF "$(CFG)" == "apache - Win32 Release" - - "$(INTDIR)\mod_userdir.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" "$(INTDIR)\mod_userdir.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)" --- 3475,3499 ---- ".\sfio.h"\ "$(INTDIR)\mod_userdir.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" + DEP_CPP_MOD_U=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_config.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_MOD_U=\ + ".\sfio.h"\ + "$(INTDIR)\mod_userdir.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)" *************** *** 2358,2363 **** --- 3502,3518 ---- !ELSEIF "$(CFG)" == "apache - Win32 Pre" + DEP_CPP_MOD_U=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_config.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + "$(INTDIR)\mod_userdir.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)" *************** *** 2366,2384 **** !ELSEIF "$(CFG)" == "apache - Win32 Profile" "$(INTDIR)\mod_userdir.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)" "$(INTDIR)\mod_userdir.sbr" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)" ! !ENDIF ! # End Source File ! ################################################################################ ! # Begin Source File - SOURCE=.\rfc1413.c DEP_CPP_RFC14=\ ".\./regex\regex.h"\ ".\alloc.h"\ --- 3521,3578 ---- !ELSEIF "$(CFG)" == "apache - Win32 Profile" + DEP_CPP_MOD_U=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_config.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_MOD_U=\ + ".\sfio.h"\ + "$(INTDIR)\mod_userdir.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)" "$(INTDIR)\mod_userdir.sbr" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)" ! !ENDIF ! ! # End Source File ! ################################################################################ ! # Begin Source File ! ! SOURCE=.\rfc1413.c ! ! !IF "$(CFG)" == "apache - Win32 Release" ! ! DEP_CPP_RFC14=\ ! ".\./regex\regex.h"\ ! ".\alloc.h"\ ! ".\buff.h"\ ! ".\conf.h"\ ! ".\http_log.h"\ ! ".\http_main.h"\ ! ".\httpd.h"\ ! ".\nt\readdir.h"\ ! ".\rfc1413.h"\ ! {$(INCLUDE)}"\sys\STAT.H"\ ! {$(INCLUDE)}"\sys\TYPES.H"\ ! ! NODEP_CPP_RFC14=\ ! ".\sfio.h"\ ! ! ! "$(INTDIR)\rfc1413.obj" : $(SOURCE) $(DEP_CPP_RFC14) "$(INTDIR)" ! ! !ELSEIF "$(CFG)" == "apache - Win32 Debug" DEP_CPP_RFC14=\ ".\./regex\regex.h"\ ".\alloc.h"\ *************** *** 2396,2410 **** ".\sfio.h"\ - !IF "$(CFG)" == "apache - Win32 Release" - - - "$(INTDIR)\rfc1413.obj" : $(SOURCE) $(DEP_CPP_RFC14) "$(INTDIR)" - - - !ELSEIF "$(CFG)" == "apache - Win32 Debug" - - "$(INTDIR)\rfc1413.obj" : $(SOURCE) $(DEP_CPP_RFC14) "$(INTDIR)" "$(INTDIR)\rfc1413.sbr" : $(SOURCE) $(DEP_CPP_RFC14) "$(INTDIR)" --- 3590,3595 ---- *************** *** 2412,2417 **** --- 3597,3615 ---- !ELSEIF "$(CFG)" == "apache - Win32 Pre" + DEP_CPP_RFC14=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_log.h"\ + ".\http_main.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + ".\rfc1413.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + "$(INTDIR)\rfc1413.obj" : $(SOURCE) $(DEP_CPP_RFC14) "$(INTDIR)" *************** *** 2420,2425 **** --- 3618,3639 ---- !ELSEIF "$(CFG)" == "apache - Win32 Profile" + DEP_CPP_RFC14=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_log.h"\ + ".\http_main.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + ".\rfc1413.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_RFC14=\ + ".\sfio.h"\ + "$(INTDIR)\rfc1413.obj" : $(SOURCE) $(DEP_CPP_RFC14) "$(INTDIR)" *************** *** 2433,2438 **** --- 3647,3655 ---- # Begin Source File SOURCE=.\util.c + + !IF "$(CFG)" == "apache - Win32 Release" + DEP_CPP_UTIL_C=\ ".\./regex\regex.h"\ ".\alloc.h"\ *************** *** 2448,2461 **** ".\sfio.h"\ - !IF "$(CFG)" == "apache - Win32 Release" - - "$(INTDIR)\util.obj" : $(SOURCE) $(DEP_CPP_UTIL_C) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" "$(INTDIR)\util.obj" : $(SOURCE) $(DEP_CPP_UTIL_C) "$(INTDIR)" --- 3665,3689 ---- ".\sfio.h"\ "$(INTDIR)\util.obj" : $(SOURCE) $(DEP_CPP_UTIL_C) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" + DEP_CPP_UTIL_C=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_conf_globals.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_UTIL_C=\ + ".\sfio.h"\ + "$(INTDIR)\util.obj" : $(SOURCE) $(DEP_CPP_UTIL_C) "$(INTDIR)" *************** *** 2464,2469 **** --- 3692,3708 ---- !ELSEIF "$(CFG)" == "apache - Win32 Pre" + DEP_CPP_UTIL_C=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_conf_globals.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + "$(INTDIR)\util.obj" : $(SOURCE) $(DEP_CPP_UTIL_C) "$(INTDIR)" *************** *** 2472,2477 **** --- 3711,3730 ---- !ELSEIF "$(CFG)" == "apache - Win32 Profile" + DEP_CPP_UTIL_C=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_conf_globals.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_UTIL_C=\ + ".\sfio.h"\ + "$(INTDIR)\util.obj" : $(SOURCE) $(DEP_CPP_UTIL_C) "$(INTDIR)" *************** *** 2527,2532 **** --- 3780,3788 ---- # Begin Source File SOURCE=.\util_md5.c + + !IF "$(CFG)" == "apache - Win32 Release" + DEP_CPP_UTIL_M=\ ".\./regex\regex.h"\ ".\alloc.h"\ *************** *** 2543,2556 **** ".\sfio.h"\ - !IF "$(CFG)" == "apache - Win32 Release" - - "$(INTDIR)\util_md5.obj" : $(SOURCE) $(DEP_CPP_UTIL_M) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" "$(INTDIR)\util_md5.obj" : $(SOURCE) $(DEP_CPP_UTIL_M) "$(INTDIR)" --- 3799,3824 ---- ".\sfio.h"\ "$(INTDIR)\util_md5.obj" : $(SOURCE) $(DEP_CPP_UTIL_M) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" + DEP_CPP_UTIL_M=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\httpd.h"\ + ".\md5.h"\ + ".\nt\readdir.h"\ + ".\util_md5.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_UTIL_M=\ + ".\sfio.h"\ + "$(INTDIR)\util_md5.obj" : $(SOURCE) $(DEP_CPP_UTIL_M) "$(INTDIR)" *************** *** 2559,2564 **** --- 3827,3844 ---- !ELSEIF "$(CFG)" == "apache - Win32 Pre" + DEP_CPP_UTIL_M=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\httpd.h"\ + ".\md5.h"\ + ".\nt\readdir.h"\ + ".\util_md5.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + "$(INTDIR)\util_md5.obj" : $(SOURCE) $(DEP_CPP_UTIL_M) "$(INTDIR)" *************** *** 2567,2572 **** --- 3847,3867 ---- !ELSEIF "$(CFG)" == "apache - Win32 Profile" + DEP_CPP_UTIL_M=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\httpd.h"\ + ".\md5.h"\ + ".\nt\readdir.h"\ + ".\util_md5.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_UTIL_M=\ + ".\sfio.h"\ + "$(INTDIR)\util_md5.obj" : $(SOURCE) $(DEP_CPP_UTIL_M) "$(INTDIR)" *************** *** 2580,2585 **** --- 3875,3883 ---- # Begin Source File SOURCE=.\mod_browser.c + + !IF "$(CFG)" == "apache - Win32 Release" + DEP_CPP_MOD_B=\ ".\./regex\regex.h"\ ".\alloc.h"\ *************** *** 2595,2608 **** ".\sfio.h"\ - !IF "$(CFG)" == "apache - Win32 Release" - - "$(INTDIR)\mod_browser.obj" : $(SOURCE) $(DEP_CPP_MOD_B) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" "$(INTDIR)\mod_browser.obj" : $(SOURCE) $(DEP_CPP_MOD_B) "$(INTDIR)" --- 3893,3917 ---- ".\sfio.h"\ "$(INTDIR)\mod_browser.obj" : $(SOURCE) $(DEP_CPP_MOD_B) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" + DEP_CPP_MOD_B=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_config.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_MOD_B=\ + ".\sfio.h"\ + "$(INTDIR)\mod_browser.obj" : $(SOURCE) $(DEP_CPP_MOD_B) "$(INTDIR)" *************** *** 2611,2616 **** --- 3920,3936 ---- !ELSEIF "$(CFG)" == "apache - Win32 Pre" + DEP_CPP_MOD_B=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_config.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + "$(INTDIR)\mod_browser.obj" : $(SOURCE) $(DEP_CPP_MOD_B) "$(INTDIR)" *************** *** 2619,2624 **** --- 3939,3958 ---- !ELSEIF "$(CFG)" == "apache - Win32 Profile" + DEP_CPP_MOD_B=\ + ".\./regex\regex.h"\ + ".\alloc.h"\ + ".\buff.h"\ + ".\conf.h"\ + ".\http_config.h"\ + ".\httpd.h"\ + ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_MOD_B=\ + ".\sfio.h"\ + "$(INTDIR)\mod_browser.obj" : $(SOURCE) $(DEP_CPP_MOD_B) "$(INTDIR)" *************** *** 2636,2647 **** --- 3970,3983 ---- !IF "$(CFG)" == "apache - Win32 Release" DEP_CPP_MODUL=\ + ".\./regex\regex.h"\ ".\alloc.h"\ ".\buff.h"\ ".\conf.h"\ ".\http_config.h"\ ".\httpd.h"\ ".\nt\readdir.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ {$(INCLUDE)}"\sys\TYPES.H"\ NODEP_CPP_MODUL=\ *************** *** 2665,2670 **** --- 4001,4009 ---- {$(INCLUDE)}"\sys\STAT.H"\ {$(INCLUDE)}"\sys\TYPES.H"\ + NODEP_CPP_MODUL=\ + ".\sfio.h"\ + BuildCmds= \ $(CPP) $(CPP_PROJ) $(SOURCE) \ *************** *** 2911,2916 **** --- 4250,4258 ---- # Begin Source File SOURCE=.\mod_info.c + + !IF "$(CFG)" == "apache - Win32 Release" + DEP_CPP_MOD_INF=\ ".\./regex\regex.h"\ ".\alloc.h"\ *************** *** 2932,2945 **** ".\sfio.h"\ - !IF "$(CFG)" == "apache - Win32 Release" - - "$(INTDIR)\mod_info.obj" : $(SOURCE) $(DEP_CPP_MOD_INF) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" "$(INTDIR)\mod_info.obj" : $(SOURCE) $(DEP_CPP_MOD_INF) "$(INTDIR)" --- 4274,4304 ---- ".\sfio.h"\ "$(INTDIR)\mod_info.obj" : $(SOURCE) $(DEP_CPP_MOD_INF) "$(INTDIR)" !ELSEIF "$(CFG)" == "apache - Win32 Debug" + DEP_CPP_MOD_INF=\ + ".\./regex\regex.h"\ + ".\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"\ + ".\nt\readdir.h"\ + ".\util_script.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_MOD_INF=\ + ".\sfio.h"\ + "$(INTDIR)\mod_info.obj" : $(SOURCE) $(DEP_CPP_MOD_INF) "$(INTDIR)" *************** *** 2948,2953 **** --- 4307,4329 ---- !ELSEIF "$(CFG)" == "apache - Win32 Pre" + DEP_CPP_MOD_INF=\ + ".\./regex\regex.h"\ + ".\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"\ + ".\nt\readdir.h"\ + ".\util_script.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + "$(INTDIR)\mod_info.obj" : $(SOURCE) $(DEP_CPP_MOD_INF) "$(INTDIR)" *************** *** 2956,2961 **** --- 4332,4357 ---- !ELSEIF "$(CFG)" == "apache - Win32 Profile" + DEP_CPP_MOD_INF=\ + ".\./regex\regex.h"\ + ".\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"\ + ".\nt\readdir.h"\ + ".\util_script.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ + {$(INCLUDE)}"\sys\TYPES.H"\ + + NODEP_CPP_MOD_INF=\ + ".\sfio.h"\ + "$(INTDIR)\mod_info.obj" : $(SOURCE) $(DEP_CPP_MOD_INF) "$(INTDIR)" *************** *** 3057,3062 **** --- 4453,4459 ---- !ELSEIF "$(CFG)" == "apache - Win32 Debug" DEP_CPP_MOD_AUT=\ + ".\./regex\regex.h"\ ".\alloc.h"\ ".\buff.h"\ ".\conf.h"\ *************** *** 3069,3074 **** --- 4466,4472 ---- ".\httpd.h"\ ".\nt\readdir.h"\ ".\util_script.h"\ + {$(INCLUDE)}"\sys\STAT.H"\ {$(INCLUDE)}"\sys\TYPES.H"\ NODEP_CPP_MOD_AUT=\ *************** *** 3098,3106 **** ".\util_script.h"\ {$(INCLUDE)}"\sys\STAT.H"\ {$(INCLUDE)}"\sys\TYPES.H"\ - - NODEP_CPP_MOD_AUT=\ - ".\sfio.h"\ "$(INTDIR)\mod_autoindex.obj" : $(SOURCE) $(DEP_CPP_MOD_AUT) "$(INTDIR)" --- 4496,4501 ---- 1.36 +4 -8 apache/src/buff.c Index: buff.c =================================================================== RCS file: /export/home/cvs/apache/src/buff.c,v retrieving revision 1.35 retrieving revision 1.36 diff -C3 -r1.35 -r1.36 *** buff.c 1997/06/30 21:16:17 1.35 --- buff.c 1997/07/13 19:01:08 1.36 *************** *** 609,616 **** * CR characters in the byte stream not immediately followed by a LF * will be preserved. */ ! int ! bgets(char *buff, int n, BUFF *fb) { int i, ch, ct; --- 609,615 ---- * CR characters in the byte stream not immediately followed by a LF * will be preserved. */ ! API_EXPORT(int) bgets(char *buff, int n, BUFF *fb) { int i, ch, ct; *************** *** 904,911 **** * It is worth noting that if an error occurs, the buffer is in an unknown * state. */ ! int ! bwrite(BUFF *fb, const void *buf, int nbyte) { int i, nwr; --- 903,909 ---- * It is worth noting that if an error occurs, the buffer is in an unknown * state. */ ! API_EXPORT(int) bwrite(BUFF *fb, const void *buf, int nbyte) { int i, nwr; *************** *** 1032,1039 **** * Flushes the buffered stream. * Returns 0 on success or -1 on error */ ! int ! bflush(BUFF *fb) { int i; --- 1030,1036 ---- * Flushes the buffered stream. * Returns 0 on success or -1 on error */ ! API_EXPORT(int) bflush(BUFF *fb) { int i; *************** *** 1086,1093 **** * Sets the EOF flag to indicate no futher data can be read, * and the EOUT flag to indicate no further data can be written. */ ! int ! bclose(BUFF *fb) { int rc1, rc2, rc3; --- 1083,1089 ---- * Sets the EOF flag to indicate no futher data can be read, * and the EOUT flag to indicate no further data can be written. */ ! API_EXPORT(int) bclose(BUFF *fb) { int rc1, rc2, rc3; 1.17 +5 -5 apache/src/buff.h Index: buff.h =================================================================== RCS file: /export/home/cvs/apache/src/buff.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C3 -r1.16 -r1.17 *** buff.h 1997/07/08 23:11:40 1.16 --- buff.h 1997/07/13 19:01:08 1.17 *************** *** 125,131 **** extern int bsetopt(BUFF *fb, int optname, const void *optval); extern int bgetopt(BUFF *fb, int optname, void *optval); extern int bsetflag(BUFF *fb, int flag, int value); ! extern int bclose(BUFF *fb); #define bgetflag(fb, flag) ((fb)->flags & (flag)) --- 125,131 ---- extern int bsetopt(BUFF *fb, int optname, const void *optval); extern int bgetopt(BUFF *fb, int optname, void *optval); extern int bsetflag(BUFF *fb, int flag, int value); ! API_EXPORT(int) bclose(BUFF *fb); #define bgetflag(fb, flag) ((fb)->flags & (flag)) *************** *** 135,145 **** /* I/O */ extern int bread(BUFF *fb, void *buf, int nbyte); ! extern int bgets(char *s, int n, BUFF *fb); extern int blookc(char *buff, BUFF *fb); extern int bskiplf(BUFF *fb); ! extern int bwrite(BUFF *fb, const void *buf, int nbyte); ! extern int bflush(BUFF *fb); extern int bputs(const char *x, BUFF *fb); extern int bvputs(BUFF *fb, ...); extern int bprintf(BUFF *fb,const char *fmt,...); --- 135,145 ---- /* I/O */ extern int bread(BUFF *fb, void *buf, int nbyte); ! API_EXPORT(int) bgets(char *s, int n, BUFF *fb); extern int blookc(char *buff, BUFF *fb); extern int bskiplf(BUFF *fb); ! API_EXPORT(int) bwrite(BUFF *fb, const void *buf, int nbyte); ! API_EXPORT(int) bflush(BUFF *fb); extern int bputs(const char *x, BUFF *fb); extern int bvputs(BUFF *fb, ...); extern int bprintf(BUFF *fb,const char *fmt,...); *************** *** 156,161 **** (fb)->outcnt == (fb)->bufsiz) ? bflsbuf(c, (fb)) : \ ((fb)->outbase[(fb)->outcnt++] = (c), 0)) ! int spawn_child_err_buff (pool *, int (*)(void *), void *, enum kill_conditions, BUFF **pipe_in, BUFF **pipe_out, BUFF **pipe_err); --- 156,161 ---- (fb)->outcnt == (fb)->bufsiz) ? bflsbuf(c, (fb)) : \ ((fb)->outbase[(fb)->outcnt++] = (c), 0)) ! API_EXPORT(int) spawn_child_err_buff (pool *, int (*)(void *), void *, enum kill_conditions, BUFF **pipe_in, BUFF **pipe_out, BUFF **pipe_err); 1.113 +22 -0 apache/src/conf.h Index: conf.h =================================================================== RCS file: /export/home/cvs/apache/src/conf.h,v retrieving revision 1.112 retrieving revision 1.113 diff -C3 -r1.112 -r1.113 *** conf.h 1997/07/10 18:32:46 1.112 --- conf.h 1997/07/13 19:01:09 1.113 *************** *** 548,553 **** --- 548,563 ---- typedef int pid_t; typedef int mode_t; typedef char * caddr_t; + + /* + Define export types. API_EXPORT_NONSTD is a nasty hack to avoid having to declare + every configuration function as __stdcall. + */ + + #define API_EXPORT(type) __declspec(dllexport) type __stdcall + #define API_EXPORT_NONSTD(type) __declspec(dllexport) type + #define MODULE_VAR_EXPORT __declspec(dllexport) + #define strcasecmp(s1, s2) stricmp(s1, s2) #define strncasecmp(s1, s2, n) strnicmp(s1, s2, n) #define lstat(x, y) stat(x, y) *************** *** 583,588 **** --- 593,610 ---- #undef NO_SETSID /* NEED_STRDUP is set on stupid systems that don't have strdup. */ #undef NEED_STRDUP + #endif + + #ifndef API_EXPORT + #define API_EXPORT(type) type + #endif + + #ifndef API_EXPORT_NONSTD + #define API_EXPORT_NONSTD(type) type + #endif + + #ifndef MODULE_VAR_EXPORT + #define MODULE_VAR_EXPORT #endif /* Do we have sys/resource.h; assume that BSD does. */ 1.13 +1 -1 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.12 retrieving revision 1.13 diff -C3 -r1.12 -r1.13 *** http_conf_globals.h 1997/06/28 23:57:55 1.12 --- http_conf_globals.h 1997/07/13 19:01:09 1.13 *************** *** 70,76 **** extern int daemons_min_free; extern int daemons_max_free; extern int daemons_limit; ! extern int suexec_enabled; extern int listenbacklog; extern char *pid_fname; --- 70,76 ---- extern int daemons_min_free; extern int daemons_max_free; extern int daemons_limit; ! MODULE_VAR_EXPORT int suexec_enabled; extern int listenbacklog; extern char *pid_fname; 1.59 +4 -6 apache/src/http_config.c Index: http_config.c =================================================================== RCS file: /export/home/cvs/apache/src/http_config.c,v retrieving revision 1.58 retrieving revision 1.59 diff -C3 -r1.58 -r1.59 *** http_config.c 1997/07/08 23:11:40 1.58 --- http_config.c 1997/07/13 19:01:09 1.59 *************** *** 103,117 **** * overridden). */ ! void * ! get_module_config (void *conf_vector, module *m) { void **confv = (void**)conf_vector; return confv[m->module_index]; } ! void ! set_module_config (void *conf_vector, module *m, void *val) { void **confv = (void**)conf_vector; confv[m->module_index] = val; --- 103,115 ---- * overridden). */ ! API_EXPORT(void *) get_module_config (void *conf_vector, module *m) { void **confv = (void**)conf_vector; return confv[m->module_index]; } ! API_EXPORT(void) set_module_config (void *conf_vector, module *m, void *val) { void **confv = (void**)conf_vector; confv[m->module_index] = val; *************** *** 778,784 **** * Generic command functions... */ ! const char *set_string_slot (cmd_parms *cmd, char *struct_ptr, char *arg) { /* This one's pretty generic... */ --- 776,782 ---- * Generic command functions... */ ! API_EXPORT_NONSTD(const char *) set_string_slot (cmd_parms *cmd, char *struct_ptr, char *arg) { /* This one's pretty generic... */ *************** *** 803,809 **** cmd_parms default_parms = { NULL, 0, -1, NULL, 0, NULL, NULL, NULL, NULL }; ! char *server_root_relative (pool *p, char *file) { #ifdef __EMX__ /* Add support for OS/2 drive names */ --- 801,807 ---- cmd_parms default_parms = { NULL, 0, -1, NULL, 0, NULL, NULL, NULL, NULL }; ! API_EXPORT(char *)server_root_relative (pool *p, char *file) { #ifdef __EMX__ /* Add support for OS/2 drive names */ 1.34 +4 -4 apache/src/http_config.h Index: http_config.h =================================================================== RCS file: /export/home/cvs/apache/src/http_config.h,v retrieving revision 1.33 retrieving revision 1.34 diff -C3 -r1.33 -r1.34 *** http_config.h 1997/07/08 02:04:42 1.33 --- http_config.h 1997/07/13 19:01:10 1.34 *************** *** 233,244 **** * data */ ! void *get_module_config (void *conf_vector, module *m); ! void set_module_config (void *conf_vector, module *m, void *val); /* Generic command handling function... */ ! const char *set_string_slot (cmd_parms *, char *, char *); const char *set_flag_slot (cmd_parms *, char *, int); /* For modules which need to read config files, open logs, etc. ... --- 233,244 ---- * data */ ! API_EXPORT(void *) get_module_config (void *conf_vector, module *m); ! API_EXPORT(void) set_module_config (void *conf_vector, module *m, void *val); /* Generic command handling function... */ ! API_EXPORT_NONSTD(const char *) set_string_slot (cmd_parms *, char *, char *); const char *set_flag_slot (cmd_parms *, char *, int); /* For modules which need to read config files, open logs, etc. ... *************** *** 246,252 **** * it relativizes it wrt server_root. */ ! char *server_root_relative (pool *p, char *fname); /* Finally, the hook for dynamically loading modules in... */ --- 246,252 ---- * it relativizes it wrt server_root. */ ! API_EXPORT(char *) server_root_relative (pool *p, char *fname); /* Finally, the hook for dynamically loading modules in... */ 1.94 +4 -5 apache/src/http_core.c Index: http_core.c =================================================================== RCS file: /export/home/cvs/apache/src/http_core.c,v retrieving revision 1.93 retrieving revision 1.94 diff -C3 -r1.93 -r1.94 *** http_core.c 1997/07/12 23:49:46 1.93 --- http_core.c 1997/07/13 19:01:10 1.94 *************** *** 243,249 **** * here... */ ! int allow_options (request_rec *r) { core_dir_config *conf = (core_dir_config *)get_module_config(r->per_dir_config, &core_module); --- 243,249 ---- * here... */ ! API_EXPORT(int) allow_options (request_rec *r) { core_dir_config *conf = (core_dir_config *)get_module_config(r->per_dir_config, &core_module); *************** *** 275,281 **** return conf->auth_name; } ! char *default_type (request_rec *r) { core_dir_config *conf = (core_dir_config *)get_module_config(r->per_dir_config, &core_module); --- 275,281 ---- return conf->auth_name; } ! API_EXPORT(char *) default_type (request_rec *r) { core_dir_config *conf = (core_dir_config *)get_module_config(r->per_dir_config, &core_module); *************** *** 300,306 **** return conf->requires; } ! int satisfies (request_rec *r) { core_dir_config *conf = (core_dir_config *)get_module_config(r->per_dir_config, &core_module); --- 300,306 ---- return conf->requires; } ! API_EXPORT(int) satisfies (request_rec *r) { core_dir_config *conf = (core_dir_config *)get_module_config(r->per_dir_config, &core_module); *************** *** 324,331 **** return conf->response_code_strings[error_index]; } ! const char * ! get_remote_host(conn_rec *conn, void *dir_config, int type) { struct in_addr *iaddr; struct hostent *hptr; --- 324,330 ---- return conf->response_code_strings[error_index]; } ! API_EXPORT(const char *) get_remote_host(conn_rec *conn, void *dir_config, int type) { struct in_addr *iaddr; struct hostent *hptr; 1.22 +4 -4 apache/src/http_core.h Index: http_core.h =================================================================== RCS file: /export/home/cvs/apache/src/http_core.h,v retrieving revision 1.21 retrieving revision 1.22 diff -C3 -r1.21 -r1.22 *** http_core.h 1997/06/29 17:53:04 1.21 --- http_core.h 1997/07/13 19:01:10 1.22 *************** *** 82,96 **** #define SATISFY_ANY 1 #define SATISFY_NOSPEC 2 ! int allow_options (request_rec *); int allow_overrides (request_rec *); ! char *default_type (request_rec *); char *document_root (request_rec *); /* Don't use this! If your request went * through a Userdir, or something like * that, it'll screw you. But it's * back-compatible... */ ! extern const char *get_remote_host(conn_rec *conn, void *dir_config, int type); extern const char *get_remote_logname(request_rec *r); /* Authentication stuff. This is one of the places where compatibility --- 82,96 ---- #define SATISFY_ANY 1 #define SATISFY_NOSPEC 2 ! API_EXPORT(int) allow_options (request_rec *); int allow_overrides (request_rec *); ! API_EXPORT(char *) default_type (request_rec *); char *document_root (request_rec *); /* Don't use this! If your request went * through a Userdir, or something like * that, it'll screw you. But it's * back-compatible... */ ! API_EXPORT(const char *) get_remote_host(conn_rec *conn, void *dir_config, int type); extern const char *get_remote_logname(request_rec *r); /* Authentication stuff. This is one of the places where compatibility *************** *** 107,113 **** char *auth_type (request_rec *); char *auth_name (request_rec *); ! int satisfies (request_rec *r); array_header *requires (request_rec *); #ifdef CORE_PRIVATE --- 107,113 ---- 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 1.19 +2 -2 apache/src/http_log.c Index: http_log.c =================================================================== RCS file: /export/home/cvs/apache/src/http_log.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C3 -r1.18 -r1.19 *** http_log.c 1997/06/29 19:19:35 1.18 --- http_log.c 1997/07/13 19:01:11 1.19 *************** *** 139,145 **** } } ! void error_log2stderr(server_rec *s) { if(fileno(s->error_log) != STDERR_FILENO) dup2(fileno(s->error_log),STDERR_FILENO); } --- 139,145 ---- } } ! API_EXPORT(void) error_log2stderr(server_rec *s) { if(fileno(s->error_log) != STDERR_FILENO) dup2(fileno(s->error_log),STDERR_FILENO); } *************** *** 196,202 **** fflush(s->error_log); } ! void log_reason(const char *reason, const char *file, request_rec *r) { fprintf (r->server->error_log, "[%s] access to %s failed for %s, reason: %s\n", --- 196,202 ---- fflush(s->error_log); } ! API_EXPORT(void) log_reason(const char *reason, const char *file, request_rec *r) { fprintf (r->server->error_log, "[%s] access to %s failed for %s, reason: %s\n", 1.8 +2 -2 apache/src/http_log.h Index: http_log.h =================================================================== RCS file: /export/home/cvs/apache/src/http_log.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C3 -r1.7 -r1.8 *** http_log.h 1997/01/01 18:10:19 1.7 --- http_log.h 1997/07/13 19:01:11 1.8 *************** *** 51,62 **** */ void open_logs (server_rec *, pool *p); ! void error_log2stderr (server_rec *); void log_pid (pool *p, char *pid_fname); void log_error(char *err, server_rec *s); extern void log_unixerr(const char *routine, const char *file, const char *msg, server_rec *s); void log_printf(const server_rec *s, const char *fmt, ...); ! void log_reason(const char *reason, const char *fname, request_rec *r); --- 51,62 ---- */ void open_logs (server_rec *, pool *p); ! API_EXPORT(void) error_log2stderr (server_rec *); void log_pid (pool *p, char *pid_fname); void log_error(char *err, server_rec *s); extern void log_unixerr(const char *routine, const char *file, const char *msg, server_rec *s); void log_printf(const server_rec *s, const char *fmt, ...); ! API_EXPORT(void) log_reason(const char *reason, const char *fname, request_rec *r); 1.178 +5 -11 apache/src/http_main.c Index: http_main.c =================================================================== RCS file: /export/home/cvs/apache/src/http_main.c,v retrieving revision 1.177 retrieving revision 1.178 diff -C3 -r1.177 -r1.178 *** http_main.c 1997/07/12 03:49:56 1.177 --- http_main.c 1997/07/13 19:01:11 1.178 *************** *** 543,549 **** * as long as it hasn't expired already. */ ! void reset_timeout (request_rec *r) { int i; if (timeout_name) { /* timeout has been set */ --- 543,549 ---- * as long as it hasn't expired already. */ ! API_EXPORT(void) reset_timeout (request_rec *r) { int i; if (timeout_name) { /* timeout has been set */ *************** *** 571,577 **** } ! void hard_timeout (char *name, request_rec *r) { timeout_req = r; timeout_name = name; --- 571,577 ---- } ! API_EXPORT(void) hard_timeout (char *name, request_rec *r) { timeout_req = r; timeout_name = name; *************** *** 580,586 **** } ! void soft_timeout (char *name, request_rec *r) { timeout_name = name; --- 580,586 ---- } ! API_EXPORT(void) soft_timeout (char *name, request_rec *r) { timeout_name = name; *************** *** 588,594 **** } ! void kill_timeout (request_rec *dummy) { set_callback_and_alarm(NULL, 0); timeout_req = NULL; timeout_name = NULL; --- 588,594 ---- } ! API_EXPORT(void) kill_timeout (request_rec *dummy) { set_callback_and_alarm(NULL, 0); timeout_req = NULL; timeout_name = NULL; *************** *** 3488,3500 **** return(0); } ! ! ! ! ! ! int ! main(int argc, char *argv[]) { int c; int child = 0; --- 3488,3494 ---- return(0); } ! __declspec(dllexport) int main(int argc, char *argv[]) { int c; int child = 0; 1.14 +4 -4 apache/src/http_main.h Index: http_main.h =================================================================== RCS file: /export/home/cvs/apache/src/http_main.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C3 -r1.13 -r1.14 *** http_main.h 1997/07/07 14:34:27 1.13 --- http_main.h 1997/07/13 19:01:12 1.14 *************** *** 85,95 **** * reset_timeout() resets the timeout in progress. */ ! void hard_timeout (char *, request_rec *); void keepalive_timeout (char *, request_rec *); ! void soft_timeout (char *, request_rec *); ! void kill_timeout (request_rec *); ! void reset_timeout (request_rec *); void sync_scoreboard_image (); int update_child_status (int child_num, int status, request_rec *r); --- 85,95 ---- * reset_timeout() resets the timeout in progress. */ ! API_EXPORT(void) hard_timeout (char *, request_rec *); void keepalive_timeout (char *, request_rec *); ! API_EXPORT(void) soft_timeout (char *, request_rec *); ! API_EXPORT(void) kill_timeout (request_rec *); ! API_EXPORT(void) reset_timeout (request_rec *); void sync_scoreboard_image (); int update_child_status (int child_num, int status, request_rec *r); 1.134 +5 -5 apache/src/http_protocol.c Index: http_protocol.c =================================================================== RCS file: /export/home/cvs/apache/src/http_protocol.c,v retrieving revision 1.133 retrieving revision 1.134 diff -C3 -r1.133 -r1.134 *** http_protocol.c 1997/07/06 05:37:19 1.133 --- http_protocol.c 1997/07/13 19:01:12 1.134 *************** *** 1175,1181 **** && strstr(ua, "MSIE 3"))); } ! void send_http_header(request_rec *r) { int i; const long int zero = 0L; --- 1175,1181 ---- && strstr(ua, "MSIE 3"))); } ! API_EXPORT(void) send_http_header(request_rec *r) { int i; const long int zero = 0L; *************** *** 1303,1309 **** * If an error occurs on input, we force an end to keepalive. */ ! int setup_client_block (request_rec *r, int read_policy) { char *tenc = table_get(r->headers_in, "Transfer-Encoding"); char *lenp = table_get(r->headers_in, "Content-Length"); --- 1303,1309 ---- * If an error occurs on input, we force an end to keepalive. */ ! API_EXPORT(int) setup_client_block (request_rec *r, int read_policy) { char *tenc = table_get(r->headers_in, "Transfer-Encoding"); char *lenp = table_get(r->headers_in, "Content-Length"); *************** *** 1346,1352 **** return OK; } ! int should_client_block (request_rec *r) { if (r->read_length || is_HTTP_ERROR(r->status)) return 0; --- 1346,1352 ---- return OK; } ! API_EXPORT(int) should_client_block (request_rec *r) { if (r->read_length || is_HTTP_ERROR(r->status)) return 0; *************** *** 1394,1400 **** * hold a chunk-size line, including any extensions. For now, we'll leave * that to the caller, at least until we can come up with a better solution. */ ! long get_client_block (request_rec *r, char *buffer, int bufsiz) { int c; long len_read, len_to_read; --- 1394,1400 ---- * hold a chunk-size line, including any extensions. For now, we'll leave * that to the caller, at least until we can come up with a better solution. */ ! API_EXPORT(long) get_client_block (request_rec *r, char *buffer, int bufsiz) { int c; long len_read, len_to_read; *************** *** 1591,1597 **** return total_bytes_sent; } ! long send_fb(BUFF *fb, request_rec *r) { return send_fb_length(fb, r, -1); } long send_fd(FILE *f, request_rec *r) { return send_fd_length(f, r, -1); } --- 1591,1597 ---- return total_bytes_sent; } ! API_EXPORT(long) send_fb(BUFF *fb, request_rec *r) { return send_fb_length(fb, r, -1); } long send_fd(FILE *f, request_rec *r) { return send_fd_length(f, r, -1); } 1.21 +5 -5 apache/src/http_protocol.h Index: http_protocol.h =================================================================== RCS file: /export/home/cvs/apache/src/http_protocol.h,v retrieving revision 1.20 retrieving revision 1.21 diff -C3 -r1.20 -r1.21 *** http_protocol.h 1997/07/06 05:37:20 1.20 --- http_protocol.h 1997/07/13 19:01:13 1.21 *************** *** 66,72 **** /* Send the Status-Line and header fields for HTTP response */ ! void send_http_header (request_rec *l); /* Send the response to special method requests */ --- 66,72 ---- /* Send the Status-Line and header fields for HTTP response */ ! API_EXPORT(void) send_http_header (request_rec *l); /* Send the response to special method requests */ *************** *** 111,117 **** long send_fd(FILE *f, request_rec *r); long send_fd_length(FILE *f, request_rec *r, long length); ! long send_fb(BUFF *f, request_rec *r); long send_fb_length(BUFF *f, request_rec *r, long length); /* Hmmm... could macrofy these for now, and maybe forever, though the --- 111,117 ---- long send_fd(FILE *f, request_rec *r); long send_fd_length(FILE *f, request_rec *r, long length); ! API_EXPORT(long) send_fb(BUFF *f, request_rec *r); long send_fb_length(BUFF *f, request_rec *r, long length); /* Hmmm... could macrofy these for now, and maybe forever, though the *************** *** 134,142 **** /* Reading a block of data from the client connection (e.g., POST arg) */ ! int setup_client_block (request_rec *r, int read_policy); ! int should_client_block (request_rec *r); ! long get_client_block (request_rec *r, char *buffer, int bufsiz); /* Sending a byterange */ --- 134,142 ---- /* Reading a block of data from the client connection (e.g., POST arg) */ ! API_EXPORT(int) setup_client_block (request_rec *r, int read_policy); ! API_EXPORT(int) should_client_block (request_rec *r); ! API_EXPORT(long) get_client_block (request_rec *r, char *buffer, int bufsiz); /* Sending a byterange */ 1.60 +2 -2 apache/src/http_request.c Index: http_request.c =================================================================== RCS file: /export/home/cvs/apache/src/http_request.c,v retrieving revision 1.59 retrieving revision 1.60 diff -C3 -r1.59 -r1.60 *** http_request.c 1997/07/08 02:09:36 1.59 --- http_request.c 1997/07/13 19:01:13 1.60 *************** *** 861,867 **** else die (status, r); } ! int some_auth_required (request_rec *r) { /* Is there a require line configured for the type of *this* req? */ --- 861,867 ---- else die (status, r); } ! API_EXPORT(int) some_auth_required (request_rec *r) { /* Is there a require line configured for the type of *this* req? */ *************** *** 1124,1130 **** * an internal redirect. */ ! void internal_redirect_handler (const char *new_uri, request_rec *r) { request_rec *new = internal_internal_redirect(new_uri, r); if (r->handler) --- 1124,1130 ---- * an internal redirect. */ ! API_EXPORT(void) internal_redirect_handler (const char *new_uri, request_rec *r) { request_rec *new = internal_internal_redirect(new_uri, r); if (r->handler) 1.12 +2 -2 apache/src/http_request.h Index: http_request.h =================================================================== RCS file: /export/home/cvs/apache/src/http_request.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C3 -r1.11 -r1.12 *** http_request.h 1997/07/08 02:09:36 1.11 --- http_request.h 1997/07/13 19:01:13 1.12 *************** *** 82,89 **** */ void internal_redirect (const char *new_uri, request_rec *); ! void internal_redirect_handler (const char *new_uri, request_rec *); ! int some_auth_required (request_rec *r); int is_initial_req(request_rec *r); #ifdef CORE_PRIVATE --- 82,89 ---- */ void internal_redirect (const char *new_uri, request_rec *); ! API_EXPORT(void) internal_redirect_handler (const char *new_uri, request_rec *); ! API_EXPORT(int) some_auth_required (request_rec *r); int is_initial_req(request_rec *r); #ifdef CORE_PRIVATE 1.126 +10 -10 apache/src/httpd.h Index: httpd.h =================================================================== RCS file: /export/home/cvs/apache/src/httpd.h,v retrieving revision 1.125 retrieving revision 1.126 diff -C3 -r1.125 -r1.126 *** httpd.h 1997/07/03 20:27:40 1.125 --- httpd.h 1997/07/13 19:01:14 1.126 *************** *** 681,687 **** extern const char month_snames[12][4]; struct tm *get_gmtoff(int *tz); ! char *get_time(); char *ht_time (pool *p, time_t t, const char *fmt, int gmt); char *gm_timestr_822(pool *p, time_t t); --- 681,687 ---- extern const char month_snames[12][4]; struct tm *get_gmtoff(int *tz); ! API_EXPORT(char *) get_time(); char *ht_time (pool *p, time_t t, const char *fmt, int gmt); char *gm_timestr_822(pool *p, time_t t); *************** *** 689,713 **** arguments (unfortunately C won't automatically convert a char ** to a const char **) */ ! char *getword(pool *p, const char **line, char stop); char *getword_nc(pool *p, char **line, char stop); char *getword_white(pool *p, const char **line); char *getword_white_nc(pool *p, char **line); char *getword_nulls (pool *p, const char **line, char stop); char *getword_nulls_nc (pool *p, char **line, char stop); ! char *getword_conf (pool *p, const char **line); char *getword_conf_nc (pool *p, char **line); char *get_token (pool *p, char **accept_line, int accept_white); int find_token (pool *p, const char *line, const char *tok); int find_last_token (pool *p, const char *line, const char *tok); ! int is_url(const char *u); extern int unescape_url(char *url); void no2slash(char *name); void getparents(char *name); char *escape_path_segment(pool *p, const char *s); ! char *os_escape_path(pool *p,const char *path,int partial); #define escape_uri(ppool,path) os_escape_path(ppool,path,1) extern char *escape_html(pool *p, const char *s); char *construct_server(pool *p, const char *hostname, unsigned port); --- 689,713 ---- arguments (unfortunately C won't automatically convert a char ** to a const char **) */ ! API_EXPORT(char *) getword(pool *p, const char **line, char stop); char *getword_nc(pool *p, char **line, char stop); char *getword_white(pool *p, const char **line); char *getword_white_nc(pool *p, char **line); char *getword_nulls (pool *p, const char **line, char stop); char *getword_nulls_nc (pool *p, char **line, char stop); ! API_EXPORT(char *) getword_conf (pool *p, const char **line); char *getword_conf_nc (pool *p, char **line); char *get_token (pool *p, char **accept_line, int accept_white); int find_token (pool *p, const char *line, const char *tok); int find_last_token (pool *p, const char *line, const char *tok); ! API_EXPORT(int) is_url(const char *u); extern int unescape_url(char *url); void no2slash(char *name); void getparents(char *name); char *escape_path_segment(pool *p, const char *s); ! API_EXPORT(char *) os_escape_path(pool *p,const char *path,int partial); #define escape_uri(ppool,path) os_escape_path(ppool,path,1) extern char *escape_html(pool *p, const char *s); char *construct_server(pool *p, const char *hostname, unsigned port); *************** *** 726,739 **** int strcasecmp_match(const char *str, const char *exp); char *uudecode (pool *, const char *); ! char *pregsub(pool *p, const char *input, const char *source, size_t nmatch, regmatch_t pmatch[]); ! void str_tolower (char *); int ind (const char *, char); /* Sigh... */ int rind (const char *, char); ! int cfg_getline(char *s, int n, FILE *f); #ifdef NEED_STRERROR char *strerror (int err); --- 726,739 ---- int strcasecmp_match(const char *str, const char *exp); char *uudecode (pool *, const char *); ! API_EXPORT(char *) pregsub(pool *p, const char *input, const char *source, size_t nmatch, regmatch_t pmatch[]); ! API_EXPORT(void) str_tolower (char *); int ind (const char *, char); /* Sigh... */ int rind (const char *, char); ! API_EXPORT(int) cfg_getline(char *s, int n, FILE *f); #ifdef NEED_STRERROR char *strerror (int err); *************** *** 744,751 **** uid_t uname2id(const char *name); gid_t gname2id(const char *name); int is_directory(const char *name); ! int can_exec(const struct stat *); ! void chdir_file(const char *file); char *get_local_host(pool *); unsigned long get_virthost_addr (const char *hostname, unsigned short *port); --- 744,751 ---- uid_t uname2id(const char *name); gid_t gname2id(const char *name); int is_directory(const char *name); ! API_EXPORT(int) can_exec(const struct stat *); ! API_EXPORT(void) chdir_file(const char *file); char *get_local_host(pool *); unsigned long get_virthost_addr (const char *hostname, unsigned short *port); 1.17 +2 -2 apache/src/mod_access.c Index: mod_access.c =================================================================== RCS file: /export/home/cvs/apache/src/mod_access.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C3 -r1.16 -r1.17 *** mod_access.c 1997/03/07 14:15:36 1.16 --- mod_access.c 1997/07/13 19:01:14 1.17 *************** *** 79,85 **** array_header *denys; } access_dir_conf; ! module access_module; void *create_access_dir_config (pool *p, char *dummy) { --- 79,85 ---- array_header *denys; } access_dir_conf; ! module MODULE_VAR_EXPORT access_module; void *create_access_dir_config (pool *p, char *dummy) { *************** *** 263,269 **** ! module access_module = { STANDARD_MODULE_STUFF, NULL, /* initializer */ create_access_dir_config, /* dir config creater */ --- 263,269 ---- ! module MODULE_VAR_EXPORT access_module = { STANDARD_MODULE_STUFF, NULL, /* initializer */ create_access_dir_config, /* dir config creater */ 1.18 +3 -2 apache/src/mod_alias.c Index: mod_alias.c =================================================================== RCS file: /export/home/cvs/apache/src/mod_alias.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C3 -r1.17 -r1.18 *** mod_alias.c 1997/07/08 04:45:28 1.17 --- mod_alias.c 1997/07/13 19:01:14 1.18 *************** *** 77,83 **** typedef struct { array_header *redirects; } alias_dir_conf; ! module alias_module; void *create_alias_config (pool *p, server_rec *s) { --- 77,84 ---- typedef struct { array_header *redirects; } alias_dir_conf; ! ! module MODULE_VAR_EXPORT alias_module; void *create_alias_config (pool *p, server_rec *s) { *************** *** 367,373 **** return DECLINED; } ! module alias_module = { STANDARD_MODULE_STUFF, NULL, /* initializer */ create_alias_dir_config, /* dir config creater */ --- 368,374 ---- return DECLINED; } ! module MODULE_VAR_EXPORT alias_module = { STANDARD_MODULE_STUFF, NULL, /* initializer */ create_alias_dir_config, /* dir config creater */ 1.45 +2 -2 apache/src/mod_cgi.c Index: mod_cgi.c =================================================================== RCS file: /export/home/cvs/apache/src/mod_cgi.c,v retrieving revision 1.44 retrieving revision 1.45 diff -C3 -r1.44 -r1.45 *** mod_cgi.c 1997/07/08 04:08:56 1.44 --- mod_cgi.c 1997/07/13 19:01:15 1.45 *************** *** 73,79 **** #include "util_script.h" #include "http_conf_globals.h" ! module cgi_module; /* KLUDGE --- for back-combatibility, we don't have to check ExecCGI * in ScriptAliased directories, which means we need to know if this --- 73,79 ---- #include "util_script.h" #include "http_conf_globals.h" ! module __declspec(dllexport) cgi_module; /* KLUDGE --- for back-combatibility, we don't have to check ExecCGI * in ScriptAliased directories, which means we need to know if this *************** *** 550,556 **** { NULL } }; ! module cgi_module = { STANDARD_MODULE_STUFF, NULL, /* initializer */ NULL, /* dir config creater */ --- 550,556 ---- { NULL } }; ! module __declspec(dllexport) cgi_module = { STANDARD_MODULE_STUFF, NULL, /* initializer */ NULL, /* dir config creater */ 1.18 +2 -2 apache/src/mod_mime.c Index: mod_mime.c =================================================================== RCS file: /export/home/cvs/apache/src/mod_mime.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C3 -r1.17 -r1.18 *** mod_mime.c 1997/03/22 23:51:03 1.17 --- mod_mime.c 1997/07/13 19:01:15 1.18 *************** *** 72,78 **** char *handler; /* Handler forced with SetHandler */ } mime_dir_config; ! module mime_module; void *create_mime_dir_config (pool *p, char *dummy) { --- 72,78 ---- char *handler; /* Handler forced with SetHandler */ } mime_dir_config; ! module MODULE_VAR_EXPORT mime_module; void *create_mime_dir_config (pool *p, char *dummy) { *************** *** 304,310 **** } ! module mime_module = { STANDARD_MODULE_STUFF, init_mime, /* initializer */ create_mime_dir_config, --- 304,310 ---- } ! module MODULE_VAR_EXPORT mime_module = { STANDARD_MODULE_STUFF, init_mime, /* initializer */ create_mime_dir_config, 1.61 +10 -11 apache/src/util.c Index: util.c =================================================================== RCS file: /export/home/cvs/apache/src/util.c,v retrieving revision 1.60 retrieving revision 1.61 diff -C3 -r1.60 -r1.61 *** util.c 1997/07/02 03:38:30 1.60 --- util.c 1997/07/13 19:01:16 1.61 *************** *** 65,71 **** "Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec" }; ! char *get_time() { time_t t; char *time_string; --- 65,71 ---- "Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec" }; ! API_EXPORT(char *) get_time() { time_t t; char *time_string; *************** *** 206,212 **** * AT&T V8 regexp package. */ ! char *pregsub(pool *p, const char *input, const char *source, size_t nmatch, regmatch_t pmatch[]) { const char *src = input; char *dest, *dst; --- 206,212 ---- * AT&T V8 regexp package. */ ! API_EXPORT(char *) pregsub(pool *p, const char *input, const char *source, size_t nmatch, regmatch_t pmatch[]) { const char *src = input; char *dest, *dst; *************** *** 424,430 **** } ! void chdir_file(const char *file) { int i; if((i = rind(file,'/')) == -1) --- 424,430 ---- } ! API_EXPORT(void) chdir_file(const char *file) { int i; if((i = rind(file,'/')) == -1) *************** *** 439,445 **** return getword(atrans,(const char **)line,stop); } ! char *getword(pool* atrans, const char **line, char stop) { int pos = ind(*line, stop); char *res; --- 439,445 ---- return getword(atrans,(const char **)line,stop); } ! API_EXPORT(char *) getword(pool* atrans, const char **line, char stop) { int pos = ind(*line, stop); char *res; *************** *** 545,551 **** return getword_conf(p,(const char **)line); } ! char *getword_conf(pool* p, const char **line) { const char *str = *line, *strend; char *res; char quote; --- 545,551 ---- return getword_conf(p,(const char **)line); } ! API_EXPORT(char *) getword_conf(pool* p, const char **line) { const char *str = *line, *strend; char *res; char quote; *************** *** 604,611 **** } #endif ! int ! cfg_getline(char *s, int n, FILE *f) { register int i=0, c; s[0] = '\0'; --- 604,610 ---- } #endif ! API_EXPORT(int) cfg_getline(char *s, int n, FILE *f) { register int i=0, c; s[0] = '\0'; *************** *** 892,898 **** return copy; } ! char *os_escape_path(pool *p,const char *path,int partial) { char *copy=palloc(p,3*strlen(path)+3); char *s=copy; --- 891,897 ---- return copy; } ! API_EXPORT(char *) os_escape_path(pool *p,const char *path,int partial) { char *copy=palloc(p,3*strlen(path)+3); char *s=copy; *************** *** 979,985 **** /* * Check for an absoluteURI syntax (see section 3.2 in RFC2068). */ ! int is_url(const char *u) { register int x; for (x = 0; u[x] != ':'; x++) { --- 978,984 ---- /* * Check for an absoluteURI syntax (see section 3.2 in RFC2068). */ ! API_EXPORT(int) is_url(const char *u) { register int x; for (x = 0; u[x] != ':'; x++) { *************** *** 993,999 **** return (x ? 1 : 0); /* If the first character is ':', it's broken, too */ } ! int can_exec(const struct stat *finfo) { #ifdef MULTIPLE_GROUPS int cnt; #endif --- 992,998 ---- return (x ? 1 : 0); /* If the first character is ':', it's broken, too */ } ! API_EXPORT(int) can_exec(const struct stat *finfo) { #ifdef MULTIPLE_GROUPS int cnt; #endif *************** *** 1135,1141 **** return -1; } ! void str_tolower(char *str) { while(*str) { *str = tolower(*str); ++str; --- 1134,1140 ---- return -1; } ! API_EXPORT(void) str_tolower(char *str) { while(*str) { *str = tolower(*str); ++str; 1.64 +5 -5 apache/src/util_script.c Index: util_script.c =================================================================== RCS file: /export/home/cvs/apache/src/util_script.c,v retrieving revision 1.63 retrieving revision 1.64 diff -C3 -r1.63 -r1.64 *** util_script.c 1997/07/06 05:37:20 1.63 --- util_script.c 1997/07/13 19:01:16 1.64 *************** *** 128,134 **** return res; } ! char **create_environment(pool *p, table *t) { array_header *env_arr = table_elts (t); table_entry *elts = (table_entry *)env_arr->elts; --- 128,134 ---- return res; } ! API_EXPORT(char **) create_environment(pool *p, table *t) { array_header *env_arr = table_elts (t); table_entry *elts = (table_entry *)env_arr->elts; *************** *** 148,154 **** return env; } ! void add_common_vars(request_rec *r) { table *e = r->subprocess_env; server_rec *s = r->server; --- 148,154 ---- return env; } ! API_EXPORT(void) add_common_vars(request_rec *r) { table *e = r->subprocess_env; server_rec *s = r->server; *************** *** 258,264 **** return pstrndup(r->pool, first, last - first); } ! void add_cgi_vars(request_rec *r) { table *e = r->subprocess_env; --- 258,264 ---- return pstrndup(r->pool, first, last - first); } ! API_EXPORT(void) add_cgi_vars(request_rec *r) { table *e = r->subprocess_env; *************** *** 312,318 **** } } ! int scan_script_header_err_buff(request_rec *r, BUFF *fb, char *buffer) { char x[MAX_STRING_LEN]; char *w, *l; --- 312,318 ---- } } ! API_EXPORT(int) scan_script_header_err_buff(request_rec *r, BUFF *fb, char *buffer) { char x[MAX_STRING_LEN]; char *w, *l; *************** *** 540,546 **** #endif ! int call_exec (request_rec *r, char *argv0, char **env, int shellcmd) { int pid = 0; #if defined(RLIMIT_CPU) || defined(RLIMIT_NPROC) || \ --- 540,546 ---- #endif ! API_EXPORT(int) call_exec (request_rec *r, char *argv0, char **env, int shellcmd) { int pid = 0; #if defined(RLIMIT_CPU) || defined(RLIMIT_NPROC) || \ 1.19 +5 -5 apache/src/util_script.h Index: util_script.h =================================================================== RCS file: /export/home/cvs/apache/src/util_script.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C3 -r1.18 -r1.19 *** util_script.h 1997/07/06 05:37:20 1.18 --- util_script.h 1997/07/13 19:01:17 1.19 *************** *** 58,70 **** #endif #endif ! char **create_environment(pool *p, table *t); int find_path_info(char *uri, char *path_info); ! void add_cgi_vars(request_rec *r); ! void add_common_vars(request_rec *r); #define scan_script_header(a1,a2) scan_script_header_err(a1,a2,NULL) int scan_script_header_err(request_rec *r, FILE *f, char *buffer); ! int scan_script_header_err_buff(request_rec *r, BUFF *f, char *buffer); void send_size(size_t size, request_rec *r); ! int call_exec (request_rec *r, char *argv0, char **env, int shellcmd); --- 58,70 ---- #endif #endif ! API_EXPORT(char **) create_environment(pool *p, table *t); int find_path_info(char *uri, char *path_info); ! API_EXPORT(void) add_cgi_vars(request_rec *r); ! API_EXPORT(void) add_common_vars(request_rec *r); #define scan_script_header(a1,a2) scan_script_header_err(a1,a2,NULL) int scan_script_header_err(request_rec *r, FILE *f, char *buffer); ! API_EXPORT(int) scan_script_header_err_buff(request_rec *r, BUFF *f, char *buffer); void send_size(size_t size, request_rec *r); ! API_EXPORT(int) call_exec (request_rec *r, char *argv0, char **env, int shellcmd); 1.1 apache/src/ApacheCore.def Index: ApacheCore.def =================================================================== LIBRARY ApacheCore 1.1 apache/src/ApacheCore.mak Index: ApacheCore.mak =================================================================== # Microsoft Developer Studio Generated NMAKE File, Format Version 4.20 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 !IF "$(CFG)" == "" CFG=ApacheCore - Win32 Debug !MESSAGE No configuration specified. Defaulting to ApacheCore - Win32 Debug. !ENDIF !IF "$(CFG)" != "ApacheCore - Win32 Release" && "$(CFG)" !=\ "ApacheCore - 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 "ApacheCore.mak" CFG="ApacheCore - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "ApacheCore - Win32 Release" (based on\ "Win32 (x86) Dynamic-Link Library") !MESSAGE "ApacheCore - 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 "ApacheCore - Win32 Debug" MTL=mktyplib.exe CPP=cl.exe RSC=rc.exe !IF "$(CFG)" == "ApacheCore - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "ApacheCo" # PROP BASE Intermediate_Dir "ApacheCo" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "CoreR" # PROP Intermediate_Dir "CoreR" # PROP Target_Dir "" OUTDIR=.\CoreR INTDIR=.\CoreR ALL : "$(OUTDIR)\ApacheCore.dll" CLEAN : [EMAIL PROTECTED] "$(INTDIR)\alloc.obj" [EMAIL PROTECTED] "$(INTDIR)\buff.obj" [EMAIL PROTECTED] "$(INTDIR)\explain.obj" [EMAIL PROTECTED] "$(INTDIR)\getopt.obj" [EMAIL PROTECTED] "$(INTDIR)\http_bprintf.obj" [EMAIL PROTECTED] "$(INTDIR)\http_config.obj" [EMAIL PROTECTED] "$(INTDIR)\http_core.obj" [EMAIL PROTECTED] "$(INTDIR)\http_log.obj" [EMAIL PROTECTED] "$(INTDIR)\http_main.obj" [EMAIL PROTECTED] "$(INTDIR)\http_protocol.obj" [EMAIL PROTECTED] "$(INTDIR)\http_request.obj" [EMAIL PROTECTED] "$(INTDIR)\md5c.obj" [EMAIL PROTECTED] "$(INTDIR)\mod_dll.obj" [EMAIL PROTECTED] "$(INTDIR)\modules_dll.obj" [EMAIL PROTECTED] "$(INTDIR)\multithread.obj" [EMAIL PROTECTED] "$(INTDIR)\readdir.obj" [EMAIL PROTECTED] "$(INTDIR)\rfc1413.obj" [EMAIL PROTECTED] "$(INTDIR)\service.obj" [EMAIL PROTECTED] "$(INTDIR)\util.obj" [EMAIL PROTECTED] "$(INTDIR)\util_date.obj" [EMAIL PROTECTED] "$(INTDIR)\util_md5.obj" [EMAIL PROTECTED] "$(INTDIR)\util_script.obj" [EMAIL PROTECTED] "$(INTDIR)\util_snprintf.obj" [EMAIL PROTECTED] "$(OUTDIR)\ApacheCore.dll" [EMAIL PROTECTED] "$(OUTDIR)\ApacheCore.exp" [EMAIL PROTECTED] "$(OUTDIR)\ApacheCore.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)/ApacheCore.pch" /YX /Fo"$(INTDIR)/" /c CPP_OBJS=.\CoreR/ 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)/ApacheCore.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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /dll /machine:I386 LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\ advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\ odbccp32.lib wsock32.lib /nologo /subsystem:windows /dll /incremental:no\ /pdb:"$(OUTDIR)/ApacheCore.pdb" /machine:I386 /def:".\ApacheCore.def"\ /out:"$(OUTDIR)/ApacheCore.dll" /implib:"$(OUTDIR)/ApacheCore.lib" DEF_FILE= \ ".\ApacheCore.def" LINK32_OBJS= \ "$(INTDIR)\alloc.obj" \ "$(INTDIR)\buff.obj" \ "$(INTDIR)\explain.obj" \ "$(INTDIR)\getopt.obj" \ "$(INTDIR)\http_bprintf.obj" \ "$(INTDIR)\http_config.obj" \ "$(INTDIR)\http_core.obj" \ "$(INTDIR)\http_log.obj" \ "$(INTDIR)\http_main.obj" \ "$(INTDIR)\http_protocol.obj" \ "$(INTDIR)\http_request.obj" \ "$(INTDIR)\md5c.obj" \ "$(INTDIR)\mod_dll.obj" \ "$(INTDIR)\modules_dll.obj" \ "$(INTDIR)\multithread.obj" \ "$(INTDIR)\readdir.obj" \ "$(INTDIR)\rfc1413.obj" \ "$(INTDIR)\service.obj" \ "$(INTDIR)\util.obj" \ "$(INTDIR)\util_date.obj" \ "$(INTDIR)\util_md5.obj" \ "$(INTDIR)\util_script.obj" \ "$(INTDIR)\util_snprintf.obj" "$(OUTDIR)\ApacheCore.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< $(LINK32_FLAGS) $(LINK32_OBJS) << !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "ApacheC0" # PROP BASE Intermediate_Dir "ApacheC0" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "CoreD" # PROP Intermediate_Dir "CoreD" # PROP Target_Dir "" OUTDIR=.\CoreD INTDIR=.\CoreD ALL : "$(OUTDIR)\ApacheCore.dll" "$(OUTDIR)\ApacheCore.bsc" CLEAN : [EMAIL PROTECTED] "$(INTDIR)\alloc.obj" [EMAIL PROTECTED] "$(INTDIR)\alloc.sbr" [EMAIL PROTECTED] "$(INTDIR)\buff.obj" [EMAIL PROTECTED] "$(INTDIR)\buff.sbr" [EMAIL PROTECTED] "$(INTDIR)\explain.obj" [EMAIL PROTECTED] "$(INTDIR)\explain.sbr" [EMAIL PROTECTED] "$(INTDIR)\getopt.obj" [EMAIL PROTECTED] "$(INTDIR)\getopt.sbr" [EMAIL PROTECTED] "$(INTDIR)\http_bprintf.obj" [EMAIL PROTECTED] "$(INTDIR)\http_bprintf.sbr" [EMAIL PROTECTED] "$(INTDIR)\http_config.obj" [EMAIL PROTECTED] "$(INTDIR)\http_config.sbr" [EMAIL PROTECTED] "$(INTDIR)\http_core.obj" [EMAIL PROTECTED] "$(INTDIR)\http_core.sbr" [EMAIL PROTECTED] "$(INTDIR)\http_log.obj" [EMAIL PROTECTED] "$(INTDIR)\http_log.sbr" [EMAIL PROTECTED] "$(INTDIR)\http_main.obj" [EMAIL PROTECTED] "$(INTDIR)\http_main.sbr" [EMAIL PROTECTED] "$(INTDIR)\http_protocol.obj" [EMAIL PROTECTED] "$(INTDIR)\http_protocol.sbr" [EMAIL PROTECTED] "$(INTDIR)\http_request.obj" [EMAIL PROTECTED] "$(INTDIR)\http_request.sbr" [EMAIL PROTECTED] "$(INTDIR)\md5c.obj" [EMAIL PROTECTED] "$(INTDIR)\md5c.sbr" [EMAIL PROTECTED] "$(INTDIR)\mod_dll.obj" [EMAIL PROTECTED] "$(INTDIR)\mod_dll.sbr" [EMAIL PROTECTED] "$(INTDIR)\modules_dll.obj" [EMAIL PROTECTED] "$(INTDIR)\modules_dll.sbr" [EMAIL PROTECTED] "$(INTDIR)\multithread.obj" [EMAIL PROTECTED] "$(INTDIR)\multithread.sbr" [EMAIL PROTECTED] "$(INTDIR)\readdir.obj" [EMAIL PROTECTED] "$(INTDIR)\readdir.sbr" [EMAIL PROTECTED] "$(INTDIR)\rfc1413.obj" [EMAIL PROTECTED] "$(INTDIR)\rfc1413.sbr" [EMAIL PROTECTED] "$(INTDIR)\service.obj" [EMAIL PROTECTED] "$(INTDIR)\service.sbr" [EMAIL PROTECTED] "$(INTDIR)\util.obj" [EMAIL PROTECTED] "$(INTDIR)\util.sbr" [EMAIL PROTECTED] "$(INTDIR)\util_date.obj" [EMAIL PROTECTED] "$(INTDIR)\util_date.sbr" [EMAIL PROTECTED] "$(INTDIR)\util_md5.obj" [EMAIL PROTECTED] "$(INTDIR)\util_md5.sbr" [EMAIL PROTECTED] "$(INTDIR)\util_script.obj" [EMAIL PROTECTED] "$(INTDIR)\util_script.sbr" [EMAIL PROTECTED] "$(INTDIR)\util_snprintf.obj" [EMAIL PROTECTED] "$(INTDIR)\util_snprintf.sbr" [EMAIL PROTECTED] "$(INTDIR)\vc40.idb" [EMAIL PROTECTED] "$(INTDIR)\vc40.pdb" [EMAIL PROTECTED] "$(OUTDIR)\ApacheCore.bsc" [EMAIL PROTECTED] "$(OUTDIR)\ApacheCore.dll" [EMAIL PROTECTED] "$(OUTDIR)\ApacheCore.exp" [EMAIL PROTECTED] "$(OUTDIR)\ApacheCore.ilk" [EMAIL PROTECTED] "$(OUTDIR)\ApacheCore.lib" [EMAIL PROTECTED] "$(OUTDIR)\ApacheCore.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" /FR /YX /c CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "regex" /D "WIN32" /D "_DEBUG" /D\ "_WINDOWS" /FR"$(INTDIR)/" /Fp"$(INTDIR)/ApacheCore.pch" /YX /Fo"$(INTDIR)/"\ /Fd"$(INTDIR)/" /c CPP_OBJS=.\CoreD/ CPP_SBRS=.\CoreD/ # 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)/ApacheCore.bsc" BSC32_SBRS= \ "$(INTDIR)\alloc.sbr" \ "$(INTDIR)\buff.sbr" \ "$(INTDIR)\explain.sbr" \ "$(INTDIR)\getopt.sbr" \ "$(INTDIR)\http_bprintf.sbr" \ "$(INTDIR)\http_config.sbr" \ "$(INTDIR)\http_core.sbr" \ "$(INTDIR)\http_log.sbr" \ "$(INTDIR)\http_main.sbr" \ "$(INTDIR)\http_protocol.sbr" \ "$(INTDIR)\http_request.sbr" \ "$(INTDIR)\md5c.sbr" \ "$(INTDIR)\mod_dll.sbr" \ "$(INTDIR)\modules_dll.sbr" \ "$(INTDIR)\multithread.sbr" \ "$(INTDIR)\readdir.sbr" \ "$(INTDIR)\rfc1413.sbr" \ "$(INTDIR)\service.sbr" \ "$(INTDIR)\util.sbr" \ "$(INTDIR)\util_date.sbr" \ "$(INTDIR)\util_md5.sbr" \ "$(INTDIR)\util_script.sbr" \ "$(INTDIR)\util_snprintf.sbr" "$(OUTDIR)\ApacheCore.bsc" : "$(OUTDIR)" $(BSC32_SBRS) $(BSC32) @<< $(BSC32_FLAGS) $(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 regex\debug\regex.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 wsock32.lib /nologo /subsystem:windows /dll /debug /machine:I386 LINK32_FLAGS=regex\debug\regex.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 wsock32.lib /nologo /subsystem:windows /dll\ /incremental:yes /pdb:"$(OUTDIR)/ApacheCore.pdb" /debug /machine:I386\ /def:".\ApacheCore.def" /out:"$(OUTDIR)/ApacheCore.dll"\ /implib:"$(OUTDIR)/ApacheCore.lib" DEF_FILE= \ ".\ApacheCore.def" LINK32_OBJS= \ "$(INTDIR)\alloc.obj" \ "$(INTDIR)\buff.obj" \ "$(INTDIR)\explain.obj" \ "$(INTDIR)\getopt.obj" \ "$(INTDIR)\http_bprintf.obj" \ "$(INTDIR)\http_config.obj" \ "$(INTDIR)\http_core.obj" \ "$(INTDIR)\http_log.obj" \ "$(INTDIR)\http_main.obj" \ "$(INTDIR)\http_protocol.obj" \ "$(INTDIR)\http_request.obj" \ "$(INTDIR)\md5c.obj" \ "$(INTDIR)\mod_dll.obj" \ "$(INTDIR)\modules_dll.obj" \ "$(INTDIR)\multithread.obj" \ "$(INTDIR)\readdir.obj" \ "$(INTDIR)\rfc1413.obj" \ "$(INTDIR)\service.obj" \ "$(INTDIR)\util.obj" \ "$(INTDIR)\util_date.obj" \ "$(INTDIR)\util_md5.obj" \ "$(INTDIR)\util_script.obj" \ "$(INTDIR)\util_snprintf.obj" "$(OUTDIR)\ApacheCore.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 "ApacheCore - Win32 Release" # Name "ApacheCore - Win32 Debug" !IF "$(CFG)" == "ApacheCore - Win32 Release" !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" !ENDIF ################################################################################ # Begin Source File SOURCE=.\http_main.c !IF "$(CFG)" == "ApacheCore - Win32 Release" DEP_CPP_HTTP_=\ ".\alloc.h"\ ".\buff.h"\ ".\conf.h"\ ".\explain.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"\ ".\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)" !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" DEP_CPP_HTTP_=\ ".\alloc.h"\ ".\buff.h"\ ".\conf.h"\ ".\explain.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"\ ".\multithread.h"\ ".\nt\getopt.h"\ ".\nt\readdir.h"\ ".\nt\service.h"\ ".\regex\regex.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)" "$(INTDIR)\http_main.sbr" : $(SOURCE) $(DEP_CPP_HTTP_) "$(INTDIR)" !ENDIF # End Source File ################################################################################ # Begin Source File SOURCE=.\buff.c !IF "$(CFG)" == "ApacheCore - Win32 Release" DEP_CPP_BUFF_=\ ".\alloc.h"\ ".\buff.h"\ ".\conf.h"\ ".\http_main.h"\ ".\httpd.h"\ ".\nt\readdir.h"\ {$(INCLUDE)}"\sys\TYPES.H"\ NODEP_CPP_BUFF_=\ ".\sfio.h"\ "$(INTDIR)\buff.obj" : $(SOURCE) $(DEP_CPP_BUFF_) "$(INTDIR)" !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" DEP_CPP_BUFF_=\ ".\alloc.h"\ ".\buff.h"\ ".\conf.h"\ ".\http_main.h"\ ".\httpd.h"\ ".\nt\readdir.h"\ ".\regex\regex.h"\ {$(INCLUDE)}"\sys\STAT.H"\ {$(INCLUDE)}"\sys\TYPES.H"\ NODEP_CPP_BUFF_=\ ".\sfio.h"\ "$(INTDIR)\buff.obj" : $(SOURCE) $(DEP_CPP_BUFF_) "$(INTDIR)" "$(INTDIR)\buff.sbr" : $(SOURCE) $(DEP_CPP_BUFF_) "$(INTDIR)" !ENDIF # End Source File ################################################################################ # 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)" "$(INTDIR)\alloc.sbr" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)" !ENDIF # End Source File ################################################################################ # Begin Source File SOURCE=.\http_log.c !IF "$(CFG)" == "ApacheCore - Win32 Release" DEP_CPP_HTTP_L=\ ".\alloc.h"\ ".\buff.h"\ ".\conf.h"\ ".\http_config.h"\ ".\http_core.h"\ ".\http_log.h"\ ".\httpd.h"\ ".\nt\readdir.h"\ {$(INCLUDE)}"\sys\TYPES.H"\ NODEP_CPP_HTTP_L=\ ".\sfio.h"\ "$(INTDIR)\http_log.obj" : $(SOURCE) $(DEP_CPP_HTTP_L) "$(INTDIR)" !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" DEP_CPP_HTTP_L=\ ".\alloc.h"\ ".\buff.h"\ ".\conf.h"\ ".\http_config.h"\ ".\http_core.h"\ ".\http_log.h"\ ".\httpd.h"\ ".\nt\readdir.h"\ ".\regex\regex.h"\ {$(INCLUDE)}"\sys\STAT.H"\ {$(INCLUDE)}"\sys\TYPES.H"\ NODEP_CPP_HTTP_L=\ ".\sfio.h"\ "$(INTDIR)\http_log.obj" : $(SOURCE) $(DEP_CPP_HTTP_L) "$(INTDIR)" "$(INTDIR)\http_log.sbr" : $(SOURCE) $(DEP_CPP_HTTP_L) "$(INTDIR)" !ENDIF # End Source File ################################################################################ # Begin Source File SOURCE=.\http_config.c 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"\ NODEP_CPP_HTTP_C=\ ".\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)" "$(INTDIR)\http_config.sbr" : $(SOURCE) $(DEP_CPP_HTTP_C) "$(INTDIR)" !ENDIF # End Source File ################################################################################ # Begin Source File SOURCE=.\util_snprintf.c DEP_CPP_UTIL_=\ ".\conf.h"\ ".\regex\regex.h"\ {$(INCLUDE)}"\sys\STAT.H"\ {$(INCLUDE)}"\sys\TYPES.H"\ !IF "$(CFG)" == "ApacheCore - Win32 Release" "$(INTDIR)\util_snprintf.obj" : $(SOURCE) $(DEP_CPP_UTIL_) "$(INTDIR)" !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" "$(INTDIR)\util_snprintf.obj" : $(SOURCE) $(DEP_CPP_UTIL_) "$(INTDIR)" "$(INTDIR)\util_snprintf.sbr" : $(SOURCE) $(DEP_CPP_UTIL_) "$(INTDIR)" !ENDIF # End Source File ################################################################################ # 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"\ ".\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)" !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)" "$(INTDIR)\http_core.sbr" : $(SOURCE) $(DEP_CPP_HTTP_CO) "$(INTDIR)" !ENDIF # End Source File ################################################################################ # Begin Source File SOURCE=.\util.c !IF "$(CFG)" == "ApacheCore - Win32 Release" DEP_CPP_UTIL_C=\ ".\alloc.h"\ ".\buff.h"\ ".\conf.h"\ ".\http_conf_globals.h"\ ".\httpd.h"\ ".\nt\readdir.h"\ {$(INCLUDE)}"\sys\TYPES.H"\ NODEP_CPP_UTIL_C=\ ".\sfio.h"\ "$(INTDIR)\util.obj" : $(SOURCE) $(DEP_CPP_UTIL_C) "$(INTDIR)" !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" DEP_CPP_UTIL_C=\ ".\alloc.h"\ ".\buff.h"\ ".\conf.h"\ ".\http_conf_globals.h"\ ".\httpd.h"\ ".\nt\readdir.h"\ ".\regex\regex.h"\ {$(INCLUDE)}"\sys\STAT.H"\ {$(INCLUDE)}"\sys\TYPES.H"\ NODEP_CPP_UTIL_C=\ ".\sfio.h"\ "$(INTDIR)\util.obj" : $(SOURCE) $(DEP_CPP_UTIL_C) "$(INTDIR)" "$(INTDIR)\util.sbr" : $(SOURCE) $(DEP_CPP_UTIL_C) "$(INTDIR)" !ENDIF # End Source File ################################################################################ # Begin Source File SOURCE=.\nt\multithread.c DEP_CPP_MULTI=\ ".\conf.h"\ ".\multithread.h"\ ".\regex\regex.h"\ {$(INCLUDE)}"\sys\STAT.H"\ {$(INCLUDE)}"\sys\TYPES.H"\ !IF "$(CFG)" == "ApacheCore - Win32 Release" "$(INTDIR)\multithread.obj" : $(SOURCE) $(DEP_CPP_MULTI) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" BuildCmds= \ $(CPP) $(CPP_PROJ) $(SOURCE) \ "$(INTDIR)\multithread.obj" : $(SOURCE) $(DEP_CPP_MULTI) "$(INTDIR)" $(BuildCmds) "$(INTDIR)\multithread.sbr" : $(SOURCE) $(DEP_CPP_MULTI) "$(INTDIR)" $(BuildCmds) !ENDIF # End Source File ################################################################################ # Begin Source File SOURCE=.\http_protocol.c !IF "$(CFG)" == "ApacheCore - Win32 Release" 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"\ ".\util_date.h"\ {$(INCLUDE)}"\sys\TYPES.H"\ NODEP_CPP_HTTP_P=\ ".\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)" "$(INTDIR)\http_protocol.sbr" : $(SOURCE) $(DEP_CPP_HTTP_P) "$(INTDIR)" !ENDIF # End Source File ################################################################################ # Begin Source File SOURCE=.\http_request.c !IF "$(CFG)" == "ApacheCore - Win32 Release" DEP_CPP_HTTP_R=\ ".\conf.h"\ ".\http_config.h"\ ".\http_core.h"\ ".\http_log.h"\ ".\http_main.h"\ ".\http_protocol.h"\ ".\http_request.h"\ ".\httpd.h"\ ".\scoreboard.h"\ "$(INTDIR)\http_request.obj" : $(SOURCE) $(DEP_CPP_HTTP_R) "$(INTDIR)" !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" DEP_CPP_HTTP_R=\ ".\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"\ ".\nt\readdir.h"\ ".\regex\regex.h"\ ".\scoreboard.h"\ {$(INCLUDE)}"\sys\STAT.H"\ {$(INCLUDE)}"\sys\TYPES.H"\ NODEP_CPP_HTTP_R=\ ".\sfio.h"\ "$(INTDIR)\http_request.obj" : $(SOURCE) $(DEP_CPP_HTTP_R) "$(INTDIR)" "$(INTDIR)\http_request.sbr" : $(SOURCE) $(DEP_CPP_HTTP_R) "$(INTDIR)" !ENDIF # End Source File ################################################################################ # Begin Source File SOURCE=.\nt\service.c DEP_CPP_SERVI=\ ".\conf.h"\ ".\multithread.h"\ ".\nt\service.h"\ ".\regex\regex.h"\ {$(INCLUDE)}"\sys\STAT.H"\ {$(INCLUDE)}"\sys\TYPES.H"\ !IF "$(CFG)" == "ApacheCore - Win32 Release" "$(INTDIR)\service.obj" : $(SOURCE) $(DEP_CPP_SERVI) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" BuildCmds= \ $(CPP) $(CPP_PROJ) $(SOURCE) \ "$(INTDIR)\service.obj" : $(SOURCE) $(DEP_CPP_SERVI) "$(INTDIR)" $(BuildCmds) "$(INTDIR)\service.sbr" : $(SOURCE) $(DEP_CPP_SERVI) "$(INTDIR)" $(BuildCmds) !ENDIF # End Source File ################################################################################ # Begin Source File SOURCE=.\nt\getopt.c !IF "$(CFG)" == "ApacheCore - Win32 Release" "$(INTDIR)\getopt.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" BuildCmds= \ $(CPP) $(CPP_PROJ) $(SOURCE) \ "$(INTDIR)\getopt.obj" : $(SOURCE) "$(INTDIR)" $(BuildCmds) "$(INTDIR)\getopt.sbr" : $(SOURCE) "$(INTDIR)" $(BuildCmds) !ENDIF # End Source File ################################################################################ # Begin Source File SOURCE=.\nt\readdir.c DEP_CPP_READD=\ ".\nt\readdir.h"\ {$(INCLUDE)}"\sys\TYPES.H"\ !IF "$(CFG)" == "ApacheCore - Win32 Release" "$(INTDIR)\readdir.obj" : $(SOURCE) $(DEP_CPP_READD) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" BuildCmds= \ $(CPP) $(CPP_PROJ) $(SOURCE) \ "$(INTDIR)\readdir.obj" : $(SOURCE) $(DEP_CPP_READD) "$(INTDIR)" $(BuildCmds) "$(INTDIR)\readdir.sbr" : $(SOURCE) $(DEP_CPP_READD) "$(INTDIR)" $(BuildCmds) !ENDIF # End Source File ################################################################################ # Begin Source File SOURCE=.\rfc1413.c !IF "$(CFG)" == "ApacheCore - Win32 Release" DEP_CPP_RFC14=\ ".\alloc.h"\ ".\buff.h"\ ".\conf.h"\ ".\http_log.h"\ ".\http_main.h"\ ".\httpd.h"\ ".\nt\readdir.h"\ ".\regex\regex.h"\ ".\rfc1413.h"\ {$(INCLUDE)}"\sys\STAT.H"\ {$(INCLUDE)}"\sys\TYPES.H"\ NODEP_CPP_RFC14=\ ".\sfio.h"\ "$(INTDIR)\rfc1413.obj" : $(SOURCE) $(DEP_CPP_RFC14) "$(INTDIR)" !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" DEP_CPP_RFC14=\ ".\alloc.h"\ ".\buff.h"\ ".\conf.h"\ ".\http_log.h"\ ".\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)" "$(INTDIR)\rfc1413.sbr" : $(SOURCE) $(DEP_CPP_RFC14) "$(INTDIR)" !ENDIF # End Source File ################################################################################ # Begin Source File SOURCE=.\md5c.c DEP_CPP_MD5C_=\ ".\md5.h"\ !IF "$(CFG)" == "ApacheCore - Win32 Release" "$(INTDIR)\md5c.obj" : $(SOURCE) $(DEP_CPP_MD5C_) "$(INTDIR)" !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" "$(INTDIR)\md5c.obj" : $(SOURCE) $(DEP_CPP_MD5C_) "$(INTDIR)" "$(INTDIR)\md5c.sbr" : $(SOURCE) $(DEP_CPP_MD5C_) "$(INTDIR)" !ENDIF # End Source File ################################################################################ # Begin Source File SOURCE=.\util_md5.c !IF "$(CFG)" == "ApacheCore - Win32 Release" DEP_CPP_UTIL_M=\ ".\alloc.h"\ ".\buff.h"\ ".\conf.h"\ ".\httpd.h"\ ".\md5.h"\ ".\nt\readdir.h"\ ".\regex\regex.h"\ ".\util_md5.h"\ {$(INCLUDE)}"\sys\STAT.H"\ {$(INCLUDE)}"\sys\TYPES.H"\ NODEP_CPP_UTIL_M=\ ".\sfio.h"\ "$(INTDIR)\util_md5.obj" : $(SOURCE) $(DEP_CPP_UTIL_M) "$(INTDIR)" !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" DEP_CPP_UTIL_M=\ ".\alloc.h"\ ".\buff.h"\ ".\conf.h"\ ".\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)" "$(INTDIR)\util_md5.sbr" : $(SOURCE) $(DEP_CPP_UTIL_M) "$(INTDIR)" !ENDIF # End Source File ################################################################################ # Begin Source File SOURCE=.\util_date.c DEP_CPP_UTIL_D=\ ".\util_date.h"\ {$(INCLUDE)}"\sys\TYPES.H"\ !IF "$(CFG)" == "ApacheCore - Win32 Release" "$(INTDIR)\util_date.obj" : $(SOURCE) $(DEP_CPP_UTIL_D) "$(INTDIR)" !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" "$(INTDIR)\util_date.obj" : $(SOURCE) $(DEP_CPP_UTIL_D) "$(INTDIR)" "$(INTDIR)\util_date.sbr" : $(SOURCE) $(DEP_CPP_UTIL_D) "$(INTDIR)" !ENDIF # End Source File ################################################################################ # Begin Source File SOURCE=.\http_bprintf.c !IF "$(CFG)" == "ApacheCore - Win32 Release" DEP_CPP_HTTP_B=\ ".\alloc.h"\ ".\buff.h"\ ".\conf.h"\ ".\httpd.h"\ ".\nt\readdir.h"\ ".\regex\regex.h"\ {$(INCLUDE)}"\sys\STAT.H"\ {$(INCLUDE)}"\sys\TYPES.H"\ NODEP_CPP_HTTP_B=\ ".\sfio.h"\ "$(INTDIR)\http_bprintf.obj" : $(SOURCE) $(DEP_CPP_HTTP_B) "$(INTDIR)" !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" DEP_CPP_HTTP_B=\ ".\alloc.h"\ ".\buff.h"\ ".\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)" "$(INTDIR)\http_bprintf.sbr" : $(SOURCE) $(DEP_CPP_HTTP_B) "$(INTDIR)" !ENDIF # End Source File ################################################################################ # Begin Source File SOURCE=.\nt\modules_dll.c !IF "$(CFG)" == "ApacheCore - Win32 Release" DEP_CPP_MODUL=\ ".\alloc.h"\ ".\buff.h"\ ".\conf.h"\ ".\http_config.h"\ ".\httpd.h"\ ".\nt\readdir.h"\ ".\regex\regex.h"\ {$(INCLUDE)}"\sys\STAT.H"\ {$(INCLUDE)}"\sys\TYPES.H"\ NODEP_CPP_MODUL=\ ".\sfio.h"\ "$(INTDIR)\modules_dll.obj" : $(SOURCE) $(DEP_CPP_MODUL) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" DEP_CPP_MODUL=\ ".\alloc.h"\ ".\buff.h"\ ".\conf.h"\ ".\http_config.h"\ ".\httpd.h"\ ".\nt\readdir.h"\ {$(INCLUDE)}"\sys\TYPES.H"\ NODEP_CPP_MODUL=\ ".\sfio.h"\ BuildCmds= \ $(CPP) $(CPP_PROJ) $(SOURCE) \ "$(INTDIR)\modules_dll.obj" : $(SOURCE) $(DEP_CPP_MODUL) "$(INTDIR)" $(BuildCmds) "$(INTDIR)\modules_dll.sbr" : $(SOURCE) $(DEP_CPP_MODUL) "$(INTDIR)" $(BuildCmds) !ENDIF # End Source File ################################################################################ # Begin Source File SOURCE=.\nt\mod_dll.c !IF "$(CFG)" == "ApacheCore - Win32 Release" DEP_CPP_MOD_D=\ ".\alloc.h"\ ".\buff.h"\ ".\conf.h"\ ".\http_config.h"\ ".\httpd.h"\ ".\nt\readdir.h"\ ".\regex\regex.h"\ {$(INCLUDE)}"\sys\STAT.H"\ {$(INCLUDE)}"\sys\TYPES.H"\ NODEP_CPP_MOD_D=\ ".\sfio.h"\ "$(INTDIR)\mod_dll.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" DEP_CPP_MOD_D=\ ".\alloc.h"\ ".\buff.h"\ ".\conf.h"\ ".\http_config.h"\ ".\httpd.h"\ ".\nt\readdir.h"\ {$(INCLUDE)}"\sys\TYPES.H"\ NODEP_CPP_MOD_D=\ ".\sfio.h"\ BuildCmds= \ $(CPP) $(CPP_PROJ) $(SOURCE) \ "$(INTDIR)\mod_dll.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)" $(BuildCmds) "$(INTDIR)\mod_dll.sbr" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)" $(BuildCmds) !ENDIF # End Source File ################################################################################ # Begin Source File SOURCE=.\explain.c DEP_CPP_EXPLA=\ ".\explain.h"\ !IF "$(CFG)" == "ApacheCore - Win32 Release" "$(INTDIR)\explain.obj" : $(SOURCE) $(DEP_CPP_EXPLA) "$(INTDIR)" !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" "$(INTDIR)\explain.obj" : $(SOURCE) $(DEP_CPP_EXPLA) "$(INTDIR)" "$(INTDIR)\explain.sbr" : $(SOURCE) $(DEP_CPP_EXPLA) "$(INTDIR)" !ENDIF # End Source File ################################################################################ # Begin Source File SOURCE=.\util_script.c !IF "$(CFG)" == "ApacheCore - Win32 Release" 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"\ ".\util_script.h"\ {$(INCLUDE)}"\sys\TYPES.H"\ NODEP_CPP_UTIL_S=\ ".\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)" "$(INTDIR)\util_script.sbr" : $(SOURCE) $(DEP_CPP_UTIL_S) "$(INTDIR)" !ENDIF # End Source File ################################################################################ # Begin Source File SOURCE=.\ApacheCore.def !IF "$(CFG)" == "ApacheCore - Win32 Release" !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" !ENDIF # End Source File # End Target # End Project ################################################################################ 1.1 apache/src/ApacheLaunch.mak Index: ApacheLaunch.mak =================================================================== # Microsoft Developer Studio Generated NMAKE File, Format Version 4.20 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Console Application" 0x0103 !IF "$(CFG)" == "" CFG=ApacheLaunch - Win32 Debug !MESSAGE No configuration specified. Defaulting to ApacheLaunch - Win32 Debug. !ENDIF !IF "$(CFG)" != "ApacheLaunch - Win32 Release" && "$(CFG)" !=\ "ApacheLaunch - 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 "ApacheLaunch.mak" CFG="ApacheLaunch - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "ApacheLaunch - Win32 Release" (based on\ "Win32 (x86) Console Application") !MESSAGE "ApacheLaunch - Win32 Debug" (based on\ "Win32 (x86) Console Application") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF !IF "$(OS)" == "Windows_NT" NULL= !ELSE NULL=nul !ENDIF ################################################################################ # Begin Project # PROP Target_Last_Scanned "ApacheLaunch - Win32 Debug" CPP=cl.exe RSC=rc.exe !IF "$(CFG)" == "ApacheLaunch - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "ApacheLa" # PROP BASE Intermediate_Dir "ApacheLa" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "LaunchR" # PROP Intermediate_Dir "LaunchR" # PROP Target_Dir "" OUTDIR=.\LaunchR INTDIR=.\LaunchR ALL : "$(OUTDIR)\ApacheLaunch.exe" CLEAN : [EMAIL PROTECTED] "$(INTDIR)\dummy.obj" [EMAIL PROTECTED] "$(OUTDIR)\ApacheLaunch.exe" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c # ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"\ /Fp"$(INTDIR)/ApacheLaunch.pch" /YX /Fo"$(INTDIR)/" /c CPP_OBJS=.\LaunchR/ CPP_SBRS=.\. # 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)/ApacheLaunch.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:console /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:console /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:console /incremental:no\ /pdb:"$(OUTDIR)/ApacheLaunch.pdb" /machine:I386\ /out:"$(OUTDIR)/ApacheLaunch.exe" LINK32_OBJS= \ "$(INTDIR)\dummy.obj" "$(OUTDIR)\ApacheLaunch.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< $(LINK32_FLAGS) $(LINK32_OBJS) << !ELSEIF "$(CFG)" == "ApacheLaunch - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "ApacheL0" # PROP BASE Intermediate_Dir "ApacheL0" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "LaunchD" # PROP Intermediate_Dir "LaunchD" # PROP Target_Dir "" OUTDIR=.\LaunchD INTDIR=.\LaunchD ALL : "$(OUTDIR)\ApacheLaunch.exe" CLEAN : [EMAIL PROTECTED] "$(INTDIR)\dummy.obj" [EMAIL PROTECTED] "$(INTDIR)\vc40.idb" [EMAIL PROTECTED] "$(INTDIR)\vc40.pdb" [EMAIL PROTECTED] "$(OUTDIR)\ApacheLaunch.exe" [EMAIL PROTECTED] "$(OUTDIR)\ApacheLaunch.ilk" [EMAIL PROTECTED] "$(OUTDIR)\ApacheLaunch.pdb" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ /Fp"$(INTDIR)/ApacheLaunch.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c CPP_OBJS=.\LaunchD/ CPP_SBRS=.\. # 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)/ApacheLaunch.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:console /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:console /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:console /incremental:yes\ /pdb:"$(OUTDIR)/ApacheLaunch.pdb" /debug /machine:I386\ /out:"$(OUTDIR)/ApacheLaunch.exe" LINK32_OBJS= \ "$(INTDIR)\dummy.obj" "$(OUTDIR)\ApacheLaunch.exe" : "$(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 "ApacheLaunch - Win32 Release" # Name "ApacheLaunch - Win32 Debug" !IF "$(CFG)" == "ApacheLaunch - Win32 Release" !ELSEIF "$(CFG)" == "ApacheLaunch - Win32 Debug" !ENDIF ################################################################################ # Begin Source File SOURCE=.\dummy.c "$(INTDIR)\dummy.obj" : $(SOURCE) "$(INTDIR)" # End Source File # End Target # End Project ################################################################################ 1.1 apache/src/dummy.c Index: dummy.c =================================================================== void dummy() { } 1.1 apache/src/nt/ApacheModuleAccess.mak Index: ApacheModuleAccess.mak =================================================================== # Microsoft Developer Studio Generated NMAKE File, Format Version 4.20 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 !IF "$(CFG)" == "" CFG=ApacheModuleAccess - Win32 Debug !MESSAGE No configuration specified. Defaulting to ApacheModuleAccess - Win32\ Debug. !ENDIF !IF "$(CFG)" != "ApacheModuleAccess - Win32 Release" && "$(CFG)" !=\ "ApacheModuleAccess - 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 "ApacheModuleAccess.mak"\ CFG="ApacheModuleAccess - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "ApacheModuleAccess - Win32 Release" (based on\ "Win32 (x86) Dynamic-Link Library") !MESSAGE "ApacheModuleAccess - 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 "ApacheModuleAccess - Win32 Debug" MTL=mktyplib.exe CPP=cl.exe RSC=rc.exe !IF "$(CFG)" == "ApacheModuleAccess - 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 "ModAccessR" # PROP Intermediate_Dir "ModAccessR" # PROP Target_Dir "" OUTDIR=.\ModAccessR INTDIR=.\ModAccessR ALL : "$(OUTDIR)\ApacheModuleAccess.dll" CLEAN : [EMAIL PROTECTED] "$(INTDIR)\mod_access.obj" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAccess.dll" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAccess.exp" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAccess.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)/ApacheModuleAccess.pch" /YX /Fo"$(INTDIR)/" /c CPP_OBJS=.\ModAccessR/ 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)/ApacheModuleAccess.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)/ApacheModuleAccess.pdb" /machine:I386\ /out:"$(OUTDIR)/ApacheModuleAccess.dll"\ /implib:"$(OUTDIR)/ApacheModuleAccess.lib" LINK32_OBJS= \ "$(INTDIR)\mod_access.obj" "$(OUTDIR)\ApacheModuleAccess.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< $(LINK32_FLAGS) $(LINK32_OBJS) << !ELSEIF "$(CFG)" == "ApacheModuleAccess - 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 "ModAccessD" # PROP Intermediate_Dir "ModAccessD" # PROP Target_Dir "" OUTDIR=.\ModAccessD INTDIR=.\ModAccessD ALL : "$(OUTDIR)\ApacheModuleAccess.dll" CLEAN : [EMAIL PROTECTED] "$(INTDIR)\mod_access.obj" [EMAIL PROTECTED] "$(INTDIR)\vc40.idb" [EMAIL PROTECTED] "$(INTDIR)\vc40.pdb" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAccess.dll" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAccess.exp" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAccess.ilk" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAccess.lib" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAccess.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)/ApacheModuleAccess.pch" /YX /Fo"$(INTDIR)/"\ /Fd"$(INTDIR)/" /c CPP_OBJS=.\ModAccessD/ 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)/ApacheModuleAccess.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)/ApacheModuleAccess.pdb" /debug /machine:I386\ /out:"$(OUTDIR)/ApacheModuleAccess.dll"\ /implib:"$(OUTDIR)/ApacheModuleAccess.lib" LINK32_OBJS= \ "$(INTDIR)\mod_access.obj" "$(OUTDIR)\ApacheModuleAccess.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 "ApacheModuleAccess - Win32 Release" # Name "ApacheModuleAccess - Win32 Debug" !IF "$(CFG)" == "ApacheModuleAccess - Win32 Release" !ELSEIF "$(CFG)" == "ApacheModuleAccess - Win32 Debug" !ENDIF ################################################################################ # Begin Source File SOURCE=\work\apache\src\mod_access.c DEP_CPP_MOD_A=\ "..\alloc.h"\ "..\buff.h"\ "..\conf.h"\ "..\http_config.h"\ "..\http_core.h"\ "..\http_log.h"\ "..\http_request.h"\ "..\httpd.h"\ "..\regex\regex.h"\ ".\readdir.h"\ {$(INCLUDE)}"\sys\stat.h"\ {$(INCLUDE)}"\sys\types.h"\ NODEP_CPP_MOD_A=\ "..\sfio.h"\ "$(INTDIR)\mod_access.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) # End Source File # End Target # End Project ################################################################################ 1.1 apache/src/nt/ApacheModuleActions.mak Index: ApacheModuleActions.mak =================================================================== # Microsoft Developer Studio Generated NMAKE File, Format Version 4.20 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 !IF "$(CFG)" == "" CFG=ApacheModuleActions - Win32 Debug !MESSAGE No configuration specified. Defaulting to ApacheModuleActions - Win32\ Debug. !ENDIF !IF "$(CFG)" != "ApacheModuleActions - Win32 Release" && "$(CFG)" !=\ "ApacheModuleActions - 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 "ApacheModuleActions.mak"\ CFG="ApacheModuleActions - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "ApacheModuleActions - Win32 Release" (based on\ "Win32 (x86) Dynamic-Link Library") !MESSAGE "ApacheModuleActions - 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 "ApacheModuleActions - Win32 Debug" MTL=mktyplib.exe CPP=cl.exe RSC=rc.exe !IF "$(CFG)" == "ApacheModuleActions - 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 "ModActionsR" # PROP Intermediate_Dir "ModActionsR" # PROP Target_Dir "" OUTDIR=.\ModActionsR INTDIR=.\ModActionsR ALL : "$(OUTDIR)\ApacheModuleActions.dll" CLEAN : [EMAIL PROTECTED] "$(INTDIR)\mod_actions.obj" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleActions.dll" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleActions.exp" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleActions.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)/ApacheModuleActions.pch" /YX /Fo"$(INTDIR)/" /c CPP_OBJS=.\ModActionsR/ 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)/ApacheModuleActions.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)/ApacheModuleActions.pdb" /machine:I386\ /out:"$(OUTDIR)/ApacheModuleActions.dll"\ /implib:"$(OUTDIR)/ApacheModuleActions.lib" LINK32_OBJS= \ "$(INTDIR)\mod_actions.obj" "$(OUTDIR)\ApacheModuleActions.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< $(LINK32_FLAGS) $(LINK32_OBJS) << !ELSEIF "$(CFG)" == "ApacheModuleActions - 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 "ModActionsD" # PROP Intermediate_Dir "ModActionsD" # PROP Target_Dir "" OUTDIR=.\ModActionsD INTDIR=.\ModActionsD ALL : "$(OUTDIR)\ApacheModuleActions.dll" CLEAN : [EMAIL PROTECTED] "$(INTDIR)\mod_actions.obj" [EMAIL PROTECTED] "$(INTDIR)\vc40.idb" [EMAIL PROTECTED] "$(INTDIR)\vc40.pdb" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleActions.dll" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleActions.exp" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleActions.ilk" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleActions.lib" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleActions.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)/ApacheModuleActions.pch" /YX /Fo"$(INTDIR)/"\ /Fd"$(INTDIR)/" /c CPP_OBJS=.\ModActionsD/ 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)/ApacheModuleActions.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)/ApacheModuleActions.pdb" /debug /machine:I386\ /out:"$(OUTDIR)/ApacheModuleActions.dll"\ /implib:"$(OUTDIR)/ApacheModuleActions.lib" LINK32_OBJS= \ "$(INTDIR)\mod_actions.obj" "$(OUTDIR)\ApacheModuleActions.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 "ApacheModuleActions - Win32 Release" # Name "ApacheModuleActions - Win32 Debug" !IF "$(CFG)" == "ApacheModuleActions - Win32 Release" !ELSEIF "$(CFG)" == "ApacheModuleActions - Win32 Debug" !ENDIF ################################################################################ # Begin Source File SOURCE=\work\apache\src\mod_actions.c 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_actions.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) # End Source File # End Target # End Project ################################################################################ 1.1 apache/src/nt/ApacheModuleAlias.mak Index: ApacheModuleAlias.mak =================================================================== # Microsoft Developer Studio Generated NMAKE File, Format Version 4.20 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 !IF "$(CFG)" == "" CFG=ApacheModuleAlias - Win32 Debug !MESSAGE No configuration specified. Defaulting to ApacheModuleAlias - Win32\ Debug. !ENDIF !IF "$(CFG)" != "ApacheModuleAlias - Win32 Release" && "$(CFG)" !=\ "ApacheModuleAlias - 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 "ApacheModuleAlias.mak" CFG="ApacheModuleAlias - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "ApacheModuleAlias - Win32 Release" (based on\ "Win32 (x86) Dynamic-Link Library") !MESSAGE "ApacheModuleAlias - 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 "ApacheModuleAlias - Win32 Debug" MTL=mktyplib.exe CPP=cl.exe RSC=rc.exe !IF "$(CFG)" == "ApacheModuleAlias - 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 "ModAliasR" # PROP Intermediate_Dir "ModAliasR" # PROP Target_Dir "" OUTDIR=.\ModAliasR INTDIR=.\ModAliasR ALL : "$(OUTDIR)\ApacheModuleAlias.dll" CLEAN : [EMAIL PROTECTED] "$(INTDIR)\mod_alias.obj" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAlias.dll" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAlias.exp" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAlias.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)/ApacheModuleAlias.pch" /YX /Fo"$(INTDIR)/" /c CPP_OBJS=.\ModAliasR/ 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)/ApacheModuleAlias.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)/ApacheModuleAlias.pdb" /machine:I386\ /out:"$(OUTDIR)/ApacheModuleAlias.dll"\ /implib:"$(OUTDIR)/ApacheModuleAlias.lib" LINK32_OBJS= \ "$(INTDIR)\mod_alias.obj" "$(OUTDIR)\ApacheModuleAlias.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< $(LINK32_FLAGS) $(LINK32_OBJS) << !ELSEIF "$(CFG)" == "ApacheModuleAlias - 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 "ModAliasD" # PROP Intermediate_Dir "ModAliasD" # PROP Target_Dir "" OUTDIR=.\ModAliasD INTDIR=.\ModAliasD ALL : "$(OUTDIR)\ApacheModuleAlias.dll" CLEAN : [EMAIL PROTECTED] "$(INTDIR)\mod_alias.obj" [EMAIL PROTECTED] "$(INTDIR)\vc40.idb" [EMAIL PROTECTED] "$(INTDIR)\vc40.pdb" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAlias.dll" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAlias.exp" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAlias.ilk" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAlias.lib" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAlias.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)/ApacheModuleAlias.pch" /YX /Fo"$(INTDIR)/"\ /Fd"$(INTDIR)/" /c CPP_OBJS=.\ModAliasD/ 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)/ApacheModuleAlias.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)/ApacheModuleAlias.pdb" /debug /machine:I386\ /out:"$(OUTDIR)/ApacheModuleAlias.dll"\ /implib:"$(OUTDIR)/ApacheModuleAlias.lib" LINK32_OBJS= \ "$(INTDIR)\mod_alias.obj" "$(OUTDIR)\ApacheModuleAlias.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 "ApacheModuleAlias - Win32 Release" # Name "ApacheModuleAlias - Win32 Debug" !IF "$(CFG)" == "ApacheModuleAlias - Win32 Release" !ELSEIF "$(CFG)" == "ApacheModuleAlias - Win32 Debug" !ENDIF ################################################################################ # Begin Source File SOURCE=\work\apache\src\mod_alias.c DEP_CPP_MOD_A=\ "..\alloc.h"\ "..\buff.h"\ "..\conf.h"\ "..\http_config.h"\ "..\httpd.h"\ "..\regex\regex.h"\ ".\readdir.h"\ {$(INCLUDE)}"\sys\stat.h"\ {$(INCLUDE)}"\sys\types.h"\ NODEP_CPP_MOD_A=\ "..\sfio.h"\ "$(INTDIR)\mod_alias.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) # End Source File # End Target # End Project ################################################################################ 1.1 apache/src/nt/ApacheModuleCGI.mak Index: ApacheModuleCGI.mak =================================================================== # Microsoft Developer Studio Generated NMAKE File, Format Version 4.20 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 !IF "$(CFG)" == "" CFG=ApacheModuleCGI - Win32 Debug !MESSAGE No configuration specified. Defaulting to ApacheModuleCGI - Win32\ Debug. !ENDIF !IF "$(CFG)" != "ApacheModuleCGI - Win32 Release" && "$(CFG)" !=\ "ApacheModuleCGI - 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 "ApacheModuleCGI.mak" CFG="ApacheModuleCGI - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "ApacheModuleCGI - Win32 Release" (based on\ "Win32 (x86) Dynamic-Link Library") !MESSAGE "ApacheModuleCGI - 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 "ApacheModuleCGI - Win32 Debug" MTL=mktyplib.exe CPP=cl.exe RSC=rc.exe !IF "$(CFG)" == "ApacheModuleCGI - 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 "ModCGIR" # PROP Intermediate_Dir "ModCGIR" # PROP Target_Dir "" OUTDIR=.\ModCGIR INTDIR=.\ModCGIR ALL : "$(OUTDIR)\ApacheModuleCGI.dll" CLEAN : [EMAIL PROTECTED] "$(INTDIR)\mod_cgi.obj" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleCGI.dll" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleCGI.exp" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleCGI.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)/ApacheModuleCGI.pch" /YX /Fo"$(INTDIR)/" /c CPP_OBJS=.\ModCGIR/ 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)/ApacheModuleCGI.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)/ApacheModuleCGI.pdb" /machine:I386\ /out:"$(OUTDIR)/ApacheModuleCGI.dll" /implib:"$(OUTDIR)/ApacheModuleCGI.lib" LINK32_OBJS= \ "$(INTDIR)\mod_cgi.obj" "$(OUTDIR)\ApacheModuleCGI.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< $(LINK32_FLAGS) $(LINK32_OBJS) << !ELSEIF "$(CFG)" == "ApacheModuleCGI - 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 "ModCGID" # PROP Intermediate_Dir "ModCGID" # PROP Target_Dir "" OUTDIR=.\ModCGID INTDIR=.\ModCGID ALL : "$(OUTDIR)\ApacheModuleCGI.dll" CLEAN : [EMAIL PROTECTED] "$(INTDIR)\mod_cgi.obj" [EMAIL PROTECTED] "$(INTDIR)\vc40.idb" [EMAIL PROTECTED] "$(INTDIR)\vc40.pdb" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleCGI.dll" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleCGI.exp" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleCGI.ilk" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleCGI.lib" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleCGI.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)/ApacheModuleCGI.pch" /YX /Fo"$(INTDIR)/"\ /Fd"$(INTDIR)/" /c CPP_OBJS=.\ModCGID/ 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)/ApacheModuleCGI.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)/ApacheModuleCGI.pdb" /debug /machine:I386\ /out:"$(OUTDIR)/ApacheModuleCGI.dll" /implib:"$(OUTDIR)/ApacheModuleCGI.lib" LINK32_OBJS= \ "$(INTDIR)\mod_cgi.obj" "$(OUTDIR)\ApacheModuleCGI.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 "ApacheModuleCGI - Win32 Release" # Name "ApacheModuleCGI - Win32 Debug" !IF "$(CFG)" == "ApacheModuleCGI - Win32 Release" !ELSEIF "$(CFG)" == "ApacheModuleCGI - Win32 Debug" !ENDIF ################################################################################ # Begin Source File SOURCE=\work\apache\src\mod_cgi.c !IF "$(CFG)" == "ApacheModuleCGI - Win32 Release" DEP_CPP_MOD_C=\ "..\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"\ "..\regex\regex.h"\ "..\util_script.h"\ ".\readdir.h"\ {$(INCLUDE)}"\sys\STAT.H"\ {$(INCLUDE)}"\sys\TYPES.H"\ NODEP_CPP_MOD_C=\ "..\sfio.h"\ "$(INTDIR)\mod_cgi.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheModuleCGI - Win32 Debug" DEP_CPP_MOD_C=\ "..\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"\ "..\regex\regex.h"\ "..\util_script.h"\ ".\readdir.h"\ {$(INCLUDE)}"\sys\STAT.H"\ {$(INCLUDE)}"\sys\TYPES.H"\ NODEP_CPP_MOD_C=\ "..\sfio.h"\ "$(INTDIR)\mod_cgi.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF # End Source File # End Target # End Project ################################################################################ 1.1 apache/src/nt/ApacheModuleMIME.mak Index: ApacheModuleMIME.mak =================================================================== # Microsoft Developer Studio Generated NMAKE File, Format Version 4.20 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 !IF "$(CFG)" == "" CFG=ApacheModuleMIME - Win32 Debug !MESSAGE No configuration specified. Defaulting to ApacheModuleMIME - Win32\ Debug. !ENDIF !IF "$(CFG)" != "ApacheModuleMIME - Win32 Release" && "$(CFG)" !=\ "ApacheModuleMIME - 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 "ApacheModuleMIME.mak" CFG="ApacheModuleMIME - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "ApacheModuleMIME - Win32 Release" (based on\ "Win32 (x86) Dynamic-Link Library") !MESSAGE "ApacheModuleMIME - 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 "ApacheModuleMIME - Win32 Debug" MTL=mktyplib.exe CPP=cl.exe RSC=rc.exe !IF "$(CFG)" == "ApacheModuleMIME - 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 "ModMIMER" # PROP Intermediate_Dir "ModMIMER" # PROP Target_Dir "" OUTDIR=.\ModMIMER INTDIR=.\ModMIMER ALL : "$(OUTDIR)\ApacheModuleMIME.dll" CLEAN : [EMAIL PROTECTED] "$(INTDIR)\mod_mime.obj" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleMIME.dll" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleMIME.exp" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleMIME.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 /MT /W3 /GX /O2 /I "..\regex" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "..\regex" /D "WIN32" /D "NDEBUG" /D\ "_WINDOWS" /Fp"$(INTDIR)/ApacheModuleMIME.pch" /YX /Fo"$(INTDIR)/" /c CPP_OBJS=.\ModMIMER/ 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)/ApacheModuleMIME.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)/ApacheModuleMIME.pdb" /machine:I386\ /out:"$(OUTDIR)/ApacheModuleMIME.dll" /implib:"$(OUTDIR)/ApacheModuleMIME.lib" LINK32_OBJS= \ "$(INTDIR)\mod_mime.obj" "$(OUTDIR)\ApacheModuleMIME.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< $(LINK32_FLAGS) $(LINK32_OBJS) << !ELSEIF "$(CFG)" == "ApacheModuleMIME - 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 "ModMIMED" # PROP Intermediate_Dir "ModMIMED" # PROP Target_Dir "" OUTDIR=.\ModMIMED INTDIR=.\ModMIMED ALL : "$(OUTDIR)\ApacheModuleMIME.dll" CLEAN : [EMAIL PROTECTED] "$(INTDIR)\mod_mime.obj" [EMAIL PROTECTED] "$(INTDIR)\vc40.idb" [EMAIL PROTECTED] "$(INTDIR)\vc40.pdb" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleMIME.dll" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleMIME.exp" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleMIME.ilk" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleMIME.lib" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleMIME.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)/ApacheModuleMIME.pch" /YX /Fo"$(INTDIR)/"\ /Fd"$(INTDIR)/" /c CPP_OBJS=.\ModMIMED/ 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)/ApacheModuleMIME.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)/ApacheModuleMIME.pdb" /debug /machine:I386\ /out:"$(OUTDIR)/ApacheModuleMIME.dll" /implib:"$(OUTDIR)/ApacheModuleMIME.lib" LINK32_OBJS= \ "$(INTDIR)\mod_mime.obj" "$(OUTDIR)\ApacheModuleMIME.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 "ApacheModuleMIME - Win32 Release" # Name "ApacheModuleMIME - Win32 Debug" !IF "$(CFG)" == "ApacheModuleMIME - Win32 Release" !ELSEIF "$(CFG)" == "ApacheModuleMIME - Win32 Debug" !ENDIF ################################################################################ # Begin Source File SOURCE=\work\apache\src\mod_mime.c !IF "$(CFG)" == "ApacheModuleMIME - Win32 Release" DEP_CPP_MOD_M=\ "..\alloc.h"\ "..\buff.h"\ "..\conf.h"\ "..\http_config.h"\ "..\httpd.h"\ ".\readdir.h"\ {$(INCLUDE)}"\sys\TYPES.H"\ NODEP_CPP_MOD_M=\ "..\sfio.h"\ "$(INTDIR)\mod_mime.obj" : $(SOURCE) $(DEP_CPP_MOD_M) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheModuleMIME - Win32 Debug" DEP_CPP_MOD_M=\ "..\alloc.h"\ "..\buff.h"\ "..\conf.h"\ "..\http_config.h"\ "..\httpd.h"\ "..\regex\regex.h"\ ".\readdir.h"\ {$(INCLUDE)}"\sys\STAT.H"\ {$(INCLUDE)}"\sys\TYPES.H"\ NODEP_CPP_MOD_M=\ "..\sfio.h"\ "$(INTDIR)\mod_mime.obj" : $(SOURCE) $(DEP_CPP_MOD_M) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF # End Source File # End Target # End Project ################################################################################ 1.1 apache/src/nt/mod_dll.c Index: mod_dll.c =================================================================== /* ==================================================================== * Copyright (c) 1995-1997 The Apache Group. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. * * 3. All advertising materials mentioning features or use of this * software must display the following acknowledgment: * "This product includes software developed by the Apache Group * for use in the Apache HTTP server project (http://www.apache.org/)." * * 4. The names "Apache Server" and "Apache Group" must not be used to * endorse or promote products derived from this software without * prior written permission. * * 5. Redistributions of any form whatsoever must retain the following * acknowledgment: * "This product includes software developed by the Apache Group * for use in the Apache HTTP server project (http://www.apache.org/)." * * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. * ==================================================================== * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Group and was originally based * on public domain software written at the National Center for * Supercomputing Applications, University of Illinois, Urbana-Champaign. * For more information on the Apache Group and the Apache HTTP server * project, please see <http://www.apache.org/>. * */ /* * mod_dll.c - DLL module loader for Windows * by Alexei Kosut, based on mod_dld.c by rst * * This module loads another module into the server that has been * compiled as a DLL. It doesn't work perfectly, but well enough. * * To use, compile the module into a DLL. Then add the following to the * server's config file (before any directives belonging to the loaded module): * * LoadModule module_name mod_name.dll * * module_name should be the name of the module (e.g. includes_module), * and mod_name.dll should be the name of the DLL, relative to the server * root. * * There is also a directive that will load a non-module DLL, if you'd * like to load additional libraries into the server: * * LoadFile filename.dll * * Compiling a module as a DLL (using Microsoft Visual C++): * * 1. Add the following to the module source file's module record * defenition: __declspec(dllexport). i.e. if you have * "module foo_module;", replace it with * "module __declspec(dllexport) foo_module;". If your module is to be * compiled with both Windows and Unix, you may wish to use an #ifdef * WIN32 * * Note that your module should still work just fine compiled-in * with this code bit there. It only activates when using the module * as a DLL. * * 2. Create a DLL file with just the module source file (and any associated * files). Be sure to link it against the libapache.lib created when * compiling libapache.dll. You may also have to tweak the settings to * find all of the Apache includes files correctly. After creating the * DLL, follow the above instructions to load it into Apache. */ #include "../httpd.h" #include "../http_config.h" /* * The hard part of implementing LoadModule is deciding what to do about * rereading the config files. This proof-of-concept implementation takes the * cheap way out: we only actually load the modules the first time through. */ static int been_there_done_that = 0; /* Loaded the modules yet? */ static int have_symbol_table = 0; char *load_module (cmd_parms *cmd, void *dummy, char *modname, char *filename) { HINSTANCE modhandle; module *modp; const char *szModuleFile=server_root_relative(cmd->pool, filename); if (been_there_done_that) return NULL; if (!(modhandle = LoadLibrary(szModuleFile))) return pstrcat (cmd->pool, "Cannot load ", szModuleFile, " into server", NULL); /* If I knew what the correct cast is here, I'd be happy. But * I don't. So I'll use (void *). It works. */ if (!(modp = (module *)(GetProcAddress (modhandle, modname)))) { return pstrcat (cmd->pool, "Can't find module ", modname, " in file ", filename, NULL); } add_module (modp); /* Alethea Patch (rws,djw2) - need to run configuration functions in new modules */ if (modp->create_server_config) ((void**)cmd->server->module_config)[modp->module_index]= (*modp->create_server_config)(cmd->pool, cmd->server); if (modp->create_dir_config) ((void**)cmd->server->lookup_defaults)[modp->module_index]= (*modp->create_dir_config)(cmd->pool, NULL); return NULL; } char *load_file (cmd_parms *cmd, void *dummy, char *filename) { if (been_there_done_that) return NULL; if (!LoadLibrary(server_root_relative(cmd->pool, filename))) return pstrcat (cmd->pool, "Cannot load ", filename, " into server", NULL); return NULL; } void check_loaded_modules (server_rec *dummy, pool *p) { if (been_there_done_that) return; been_there_done_that = 1; } command_rec dll_cmds[] = { { "LoadModule", load_module, NULL, RSRC_CONF, TAKE2, "a module name, and the name of a file to load it from"}, { "LoadFile", load_file, NULL, RSRC_CONF, ITERATE, "files or libraries to link into the server at runtime"}, { NULL } }; module dll_module = { STANDARD_MODULE_STUFF, check_loaded_modules, /* initializer */ NULL, /* create per-dir config */ NULL, /* merge per-dir config */ NULL, /* server config */ NULL, /* merge server config */ dll_cmds, /* command table */ NULL, /* handlers */ NULL, /* filename translation */ NULL, /* check_user_id */ NULL, /* check auth */ NULL, /* check access */ NULL, /* type_checker */ NULL, /* logger */ NULL /* header parser */ }; 1.1 apache/src/nt/modules_dll.c Index: modules_dll.c =================================================================== /* modules.c --- automatically generated by Apache * configuration script. DO NOT HAND EDIT!!!!! */ #include "../httpd.h" #include "../http_config.h" extern module core_module; extern module dll_module; module *prelinked_modules[] = { &core_module, &dll_module, NULL }; module *preloaded_modules[] = { &core_module, &dll_module, NULL }; 1.2 +5 -1 apache/src/regex/regex.h Index: regex.h =================================================================== RCS file: /export/home/cvs/apache/src/regex/regex.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C3 -r1.1 -r1.2 *** regex.h 1996/07/23 22:06:46 1.1 --- regex.h 1997/07/13 19:01:36 1.2 *************** *** 5,10 **** --- 5,14 ---- extern "C" { #endif + #ifdef WIN32 + #define API_EXPORT(type) __declspec(dllexport) type __stdcall + #endif + /* === regex2.h === */ typedef off_t regoff_t; typedef struct { *************** *** 54,60 **** /* === regexec.c === */ ! extern int regexec(const regex_t *, const char *, size_t, regmatch_t [], int); #define REG_NOTBOL 00001 #define REG_NOTEOL 00002 #define REG_STARTEND 00004 --- 58,64 ---- /* === regexec.c === */ ! API_EXPORT(int) regexec(const regex_t *, const char *, size_t, regmatch_t [], int); #define REG_NOTBOL 00001 #define REG_NOTEOL 00002 #define REG_STARTEND 00004 1.2 +4 -4 apache/src/regex/regex.mak Index: regex.mak =================================================================== RCS file: /export/home/cvs/apache/src/regex/regex.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -C3 -r1.1 -r1.2 *** regex.mak 1997/06/15 19:22:53 1.1 --- regex.mak 1997/07/13 19:01:36 1.2 *************** *** 61,68 **** if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c ! # ADD CPP /nologo /MT /W3 /GX /O2 /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c ! CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS"\ /Fp"$(INTDIR)/regex.pch" /YX /Fo"$(INTDIR)/" /c CPP_OBJS=.\Release/ CPP_SBRS=.\. --- 61,68 ---- if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c ! # ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c ! CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS"\ /Fp"$(INTDIR)/regex.pch" /YX /Fo"$(INTDIR)/" /c CPP_OBJS=.\Release/ CPP_SBRS=.\. *************** *** 120,127 **** if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c ! # ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /c ! CPP_PROJ=/nologo /MTd /W3 /GX /Z7 /Od /I "." /D "WIN32" /D "_DEBUG" /D\ "_WINDOWS" /FR"$(INTDIR)/" /Fp"$(INTDIR)/regex.pch" /YX /Fo"$(INTDIR)/" /c CPP_OBJS=.\Debug/ CPP_SBRS=.\Debug/ --- 120,127 ---- if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c ! # ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /c ! CPP_PROJ=/nologo /MDd /W3 /GX /Z7 /Od /I "." /D "WIN32" /D "_DEBUG" /D\ "_WINDOWS" /FR"$(INTDIR)/" /Fp"$(INTDIR)/regex.pch" /YX /Fo"$(INTDIR)/" /c CPP_OBJS=.\Debug/ CPP_SBRS=.\Debug/ 1.3 +1 -1 apache/src/regex/regexec.c Index: regexec.c =================================================================== RCS file: /export/home/cvs/apache/src/regex/regexec.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C3 -r1.2 -r1.3 *** regexec.c 1997/02/17 04:52:41 1.2 --- regexec.c 1997/07/13 19:01:37 1.3 *************** *** 111,117 **** * when choosing which matcher to call. Also, by this point the matchers * have been prototyped. */ ! int /* 0 success, REG_NOMATCH failure */ regexec(preg, string, nmatch, pmatch, eflags) const regex_t *preg; const char *string; --- 111,117 ---- * when choosing which matcher to call. Also, by this point the matchers * have been prototyped. */ ! API_EXPORT(int) /* 0 success, REG_NOMATCH failure */ regexec(preg, string, nmatch, pmatch, eflags) const regex_t *preg; const char *string;