diff options
| author | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2011-03-22 19:49:19 +0000 |
|---|---|---|
| committer | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2011-03-22 19:49:19 +0000 |
| commit | 0b964040c2adde6c144610cdd8357b71f569cf40 (patch) | |
| tree | 4c93da31baebd395e110e1d1f366a18035480970 /include | |
| parent | b0201c7681f052d790813f588cbbbf9d8798df5f (diff) | |
| download | libapr-0b964040c2adde6c144610cdd8357b71f569cf40.tar.gz | |
grab some Windows/MinGW code tweaks from trunk for quieter gcc builds
time/win32/timestr.c: all of r892188
include/arch/win32/apr_arch_file_io.h: part of r892386
misc/win32/rand.c: all of r892426
misc/win32/misc.c: part of r892177
misc/win32/internal.c: all of r892390
poll/unix/pollset.c: part of r892386
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.4.x@1084323 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include')
| -rw-r--r-- | include/apr_thread_proc.h | 4 | ||||
| -rw-r--r-- | include/arch/win32/apr_arch_file_io.h | 8 |
2 files changed, 11 insertions, 1 deletions
diff --git a/include/apr_thread_proc.h b/include/apr_thread_proc.h index 7df84ef32..65a475b4a 100644 --- a/include/apr_thread_proc.h +++ b/include/apr_thread_proc.h @@ -775,7 +775,9 @@ APR_DECLARE(apr_status_t) apr_proc_kill(apr_proc_t *proc, int sig); * @param proc The process to register * @param how How to kill the process, one of: * <PRE> - * APR_KILL_NEVER -- process is never sent any signals + * APR_KILL_NEVER -- process is never sent any signals; it is + * reaped if it has exited before the pool is + * cleaned up * APR_KILL_ALWAYS -- process is sent SIGKILL on apr_pool_t cleanup * APR_KILL_AFTER_TIMEOUT -- SIGTERM, wait 3 seconds, SIGKILL * APR_JUST_WAIT -- wait forever for the process to complete diff --git a/include/arch/win32/apr_arch_file_io.h b/include/arch/win32/apr_arch_file_io.h index 6afaf8fb1..38efa2774 100644 --- a/include/arch/win32/apr_arch_file_io.h +++ b/include/arch/win32/apr_arch_file_io.h @@ -252,4 +252,12 @@ apr_status_t filepath_root_case(char **rootpath, char *root, apr_pool_t *p); apr_status_t file_cleanup(void *); +extern apr_status_t +apr_file_socket_pipe_create(apr_file_t **in, + apr_file_t **out, + apr_pool_t *p); + +extern apr_status_t +apr_file_socket_pipe_close(apr_file_t *file); + #endif /* ! FILE_IO_H */ |