You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by st...@locus.apache.org on 2000/04/14 18:50:28 UTC
cvs commit: apache-2.0/src/lib/apr/misc/win32 misc.h start.c
stoddard 00/04/14 09:50:28
Modified: src/lib/apr aprlib.def
src/lib/apr/include apr_config.hw
src/lib/apr/misc/win32 misc.h start.c
Log:
Get Windows compiling after the ap_context_t --> ap_pool_t change
Revision Changes Path
1.19 +1 -1 apache-2.0/src/lib/apr/aprlib.def
Index: aprlib.def
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/aprlib.def,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- aprlib.def 2000/04/14 15:02:13 1.18
+++ aprlib.def 2000/04/14 16:50:24 1.19
@@ -120,7 +120,7 @@
ap_get_os_threadkey @111
ap_os_systemcase_filename @112
canonical_filename @113
- ap_create_context @114
+ ap_create_pool @114
ap_destroy_context @115
; WinTimeToUnixTime @116
; ap_get_oslevel @117
1.8 +1 -1 apache-2.0/src/lib/apr/include/apr_config.hw
Index: apr_config.hw
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_config.hw,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- apr_config.hw 2000/04/13 18:49:29 1.7
+++ apr_config.hw 2000/04/14 16:50:25 1.8
@@ -217,7 +217,7 @@
* This section should define those functions which are
* only found in the windows version of APR.
*/
-ap_status_t ap_get_oslevel(struct ap_context_t *, ap_oslevel_e *);
+ap_status_t ap_get_oslevel(struct ap_pool_t *, ap_oslevel_e *);
unsigned __stdcall SignalHandling(void *);
int thread_ready(void);
1.10 +0 -6 apache-2.0/src/lib/apr/misc/win32/misc.h
Index: misc.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/misc.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- misc.h 2000/04/14 15:58:34 1.9
+++ misc.h 2000/04/14 16:50:26 1.10
@@ -67,12 +67,6 @@
struct datastruct *prev;
} datastruct;
-struct ap_pool_t {
- struct ap_pool_t *pool;
- datastruct *prog_data;
- int (*apr_abort)(int retcode);
-};
-
#define WSAHighByte 2
#define WSALowByte 0
1.24 +3 -9 apache-2.0/src/lib/apr/misc/win32/start.c
Index: start.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/start.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- start.c 2000/04/14 15:58:34 1.23
+++ start.c 2000/04/14 16:50:26 1.24
@@ -75,22 +75,18 @@
WSADATA wsaData;
int err;
ap_pool_t *new;
- ap_pool_t *pool;
if (cont) {
- pool = ap_make_sub_pool(cont->pool, cont->apr_abort);
+ new = ap_make_sub_pool(cont, cont->apr_abort);
}
else {
- pool = ap_make_sub_pool(NULL, NULL);
+ new = ap_make_sub_pool(NULL, NULL);
}
- if (pool == NULL) {
+ if (new == NULL) {
return APR_ENOPOOL;
}
- new = (ap_pool_t *)ap_palloc(cont, sizeof(ap_pool_t));
-
- new->pool = pool;
new->prog_data = NULL;
new->apr_abort = NULL;
@@ -104,8 +100,6 @@
WSACleanup();
return APR_EEXIST;
}
-
- ap_register_cleanup(new, NULL, clean_cont, ap_null_cleanup);
*newcont = new;
return APR_SUCCESS;