diff options
| author | Ryan Bloom <rbb@apache.org> | 2000-05-01 21:22:46 +0000 |
|---|---|---|
| committer | Ryan Bloom <rbb@apache.org> | 2000-05-01 21:22:46 +0000 |
| commit | 7ffcdbd6afaa5b7a54fb253d194c211692506dd7 (patch) | |
| tree | 30de0cb03b181e3056fbfee563987d5c781c0f27 /include | |
| parent | 11b033f20d2ad2b73a2683c874ddccb76ae927aa (diff) | |
| download | apr-7ffcdbd6afaa5b7a54fb253d194c211692506dd7.tar.gz | |
Add options to APR to allow OTHER_CHILD support to be turned on and off.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@60011 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include')
| -rw-r--r-- | include/apr.h.in | 1 | ||||
| -rw-r--r-- | include/apr_thread_proc.h | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/include/apr.h.in b/include/apr.h.in index ce4e59775..5b020a5c2 100644 --- a/include/apr.h.in +++ b/include/apr.h.in @@ -63,6 +63,7 @@ #define APR_HAS_FORK @fork@ #define APR_HAS_RANDOM @rand@ #define APR_HAS_XLATE @iconv@ +#define APR_HAS_OTHER_CHILD @oc@ /* Typedefs that APR needs. */ diff --git a/include/apr_thread_proc.h b/include/apr_thread_proc.h index b2625366c..738740098 100644 --- a/include/apr_thread_proc.h +++ b/include/apr_thread_proc.h @@ -72,6 +72,7 @@ typedef enum {APR_WAIT, APR_NOWAIT} ap_wait_how_e; #define APR_PARENT_BLOCK 3 #define APR_CHILD_BLOCK 4 +#if APR_HAS_OTHER_CHILD #define APR_OC_REASON_DEATH 0 /* child has died, caller must call * unregister still */ #define APR_OC_REASON_UNWRITABLE 1 /* write_fd is unwritable */ @@ -84,6 +85,7 @@ typedef enum {APR_WAIT, APR_NOWAIT} ap_wait_how_e; * kill the child) */ #define APR_OC_REASON_LOST 4 /* somehow the child exited without * us knowing ... buggy os? */ +#endif /* APR_HAS_OTHER_CHILD */ typedef struct ap_thread_t ap_thread_t; typedef struct ap_threadattr_t ap_threadattr_t; @@ -91,7 +93,9 @@ typedef struct ap_proc_t ap_proc_t; typedef struct ap_procattr_t ap_procattr_t; typedef struct ap_threadkey_t ap_threadkey_t; +#if APR_HAS_OTHER_CHILD typedef struct ap_other_child_rec_t ap_other_child_rec_t; +#endif /* APR_HAS_OTHER_CHILD */ typedef void *(API_THREAD_FUNC *ap_thread_start_t)(void *); @@ -583,6 +587,7 @@ B<Detach the process from the controlling terminal.> */ ap_status_t ap_detach(ap_proc_t **new, ap_pool_t *cont); +#if APR_HAS_OTHER_CHILD /* =head1 void ap_register_other_child(ap_proc_t *pid, void (*maintenance) (int reason, void *data, int status), void *data, int write_fd, ap_pool_t *p) @@ -645,6 +650,7 @@ B<Loop through all registered other_children and call the appropriate maintenanc =cut */ void ap_check_other_child(void); +#endif /* APR_HAS_OTHER_CHILD */ /* |