diff options
author | stoddard <stoddard@13f79535-47bb-0310-9956-ffa450edef68> | 1999-11-29 23:29:29 +0000 |
---|---|---|
committer | stoddard <stoddard@13f79535-47bb-0310-9956-ffa450edef68> | 1999-11-29 23:29:29 +0000 |
commit | a9db4f66d705b45f32e90c395b41130324cea4ec (patch) | |
tree | 843f0538f092abc01fc5e3d196c4488ce0e7adfb /misc/win32/start.c | |
parent | bc92df65586218a6c160103c26043f6801b0d76a (diff) | |
download | libapr-a9db4f66d705b45f32e90c395b41130324cea4ec.tar.gz |
Fix some Windows compile breaks
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@59490 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'misc/win32/start.c')
-rw-r--r-- | misc/win32/start.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/misc/win32/start.c b/misc/win32/start.c index 145ed73e5..98bd0e906 100644 --- a/misc/win32/start.c +++ b/misc/win32/start.c @@ -78,7 +78,7 @@ ap_status_t ap_create_context(ap_context_t **newcont, ap_context_t *cont) ap_pool_t *pool; if (cont) { - pool = ap_make_sub_pool(cont->pool); + pool = ap_make_sub_pool(cont->pool, cont->apr_abort); } else { pool = ap_init_alloc();; @@ -89,8 +89,10 @@ ap_status_t ap_create_context(ap_context_t **newcont, ap_context_t *cont) } new = (ap_context_t *)ap_palloc(cont, sizeof(ap_context_t)); + new->pool = pool; new->prog_data = NULL; + new->apr_abort = NULL; iVersionRequested = MAKEWORD(WSAHighByte, WSALowByte); err = WSAStartup((WORD) iVersionRequested, &wsaData); @@ -198,6 +200,7 @@ ap_status_t ap_get_userdata(void **data, char *key, struct context_t *cont) /* This puts one thread in a Listen for signals mode */ ap_status_t ap_initialize(void) { +#if 0 unsigned tid; if (_beginthreadex(NULL, 0, SignalHandling, NULL, 0, &tid) == 0) { @@ -207,6 +210,6 @@ ap_status_t ap_initialize(void) while (thread_ready() != 1) { sleep(1); } - +#endif return APR_SUCCESS; } |