rbb 99/06/01 08:09:42
Modified: apr/include apr_lib.h apr_pools.h Log: Changes to let APR begin to compile on Windows. Shouldn't affect unix, but I'll check after I commit. Revision Changes Path 1.5 +6 -1 apache-apr/apr/include/apr_lib.h Index: apr_lib.h =================================================================== RCS file: /home/cvs/apache-apr/apr/include/apr_lib.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- apr_lib.h 1999/05/10 17:46:19 1.4 +++ apr_lib.h 1999/06/01 15:09:41 1.5 @@ -65,7 +65,9 @@ #define APR_LIB_H #include "apr_general.h" +#ifndef WIN32 #include "apr_config.h" +#endif #include "hsregex.h" #ifdef __cplusplus @@ -285,6 +287,7 @@ ap_status_t (*cleanup) (void *)); API_EXPORT(void) ap_cleanup_for_exec(void); API_EXPORT_NONSTD(void) ap_null_cleanup(void *data); +/* API_EXPORT(void) ap_note_cleanups_for_fd(ap_pool_t *p, int fd); API_EXPORT(void) ap_kill_cleanups_for_fd(ap_pool_t *p, int fd); API_EXPORT(int) ap_popenf(ap_pool_t *a, const char *name, int flg, int mode); @@ -300,11 +303,13 @@ API_EXPORT(void) ap_kill_cleanups_for_socket(ap_pool_t *p, int sock); API_EXPORT(int) ap_psocket(ap_pool_t *p, int domain, int type, int protocol); API_EXPORT(int) ap_pclosesocket(ap_pool_t *a, int sock); +*/ API_EXPORT(regex_t *) ap_pregcomp(ap_pool_t *p, const char *pattern, int cflags); API_EXPORT(void) ap_pregfree(ap_pool_t *p, regex_t *reg); -API_EXPORT(void) ap_note_subprocess(ap_pool_t *a, pid_t pid, +/*API_EXPORT(void) ap_note_subprocess(ap_pool_t *a, pid_t pid, enum kill_conditions how); +*/ API_EXPORT(int) ap_spawn_child(ap_pool_t *p, int (*func) (void *a, ap_child_info_t *c), 1.3 +3 -3 apache-apr/apr/include/apr_pools.h Index: apr_pools.h =================================================================== RCS file: /home/cvs/apache-apr/apr/include/apr_pools.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- apr_pools.h 1999/05/10 17:46:19 1.2 +++ apr_pools.h 1999/06/01 15:09:41 1.3 @@ -85,7 +85,7 @@ /* Need declaration of DIR on Win32 */ #ifdef WIN32 -#include "../os/win32/readdir.h" +/*#include "../os/win32/readdir.h"*/ #endif #include "apr_lib.h" @@ -278,9 +278,9 @@ API_EXPORT(int) ap_pclosef(ap_pool_t *, int fd); /* routines to deal with directories */ -API_EXPORT(DIR *) ap_popendir(ap_pool_t *p, const char *name); +/*API_EXPORT(DIR *) ap_popendir(ap_pool_t *p, const char *name); API_EXPORT(void) ap_pclosedir(ap_pool_t *p, DIR * d); - +*/ /* ... even child processes (which we may want to wait for, * or to kill outright, on unexpected termination). *