trawick 02/03/14 13:42:07
Modified: include apr_thread_proc.h
memory/unix apr_pools.c
Log:
struct process_chain is not part of the API, so get it out of
apr_thread_proc.h and instead move it to the one file that needs it
Revision Changes Path
1.83 +0 -16 apr/include/apr_thread_proc.h
Index: apr_thread_proc.h
===================================================================
RCS file: /home/cvs/apr/include/apr_thread_proc.h,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- apr_thread_proc.h 13 Mar 2002 20:39:15 -0000 1.82
+++ apr_thread_proc.h 14 Mar 2002 21:42:07 -0000 1.83
@@ -191,22 +191,6 @@
kill_only_once /**< send SIGTERM and then wait */
};
-/** A list of processes */
-struct process_chain {
- /** The process ID */
- apr_proc_t *pid;
- /** When the process should be sent a signal. <PRE>
- * kill_never -- process is never sent any signals
- * kill_always -- process is sent SIGKILL on apr_pool_t
cleanup
- * kill_after_timeout -- SIGTERM, wait 3 seconds, SIGKILL
- * just_wait -- wait forever for the process to complete
- * kill_only_once -- send SIGTERM and then wait </PRE>
- */
- enum kill_conditions kill_how;
- /** The next process in the list */
- struct process_chain *next;
-};
-
/* Thread Function definitions */
#if APR_HAS_THREADS
1.157 +16 -0 apr/memory/unix/apr_pools.c
Index: apr_pools.c
===================================================================
RCS file: /home/cvs/apr/memory/unix/apr_pools.c,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- apr_pools.c 13 Mar 2002 20:39:22 -0000 1.156
+++ apr_pools.c 14 Mar 2002 21:42:07 -0000 1.157
@@ -105,6 +105,22 @@
typedef struct cleanup_t cleanup_t;
+/** A list of processes */
+struct process_chain {
+ /** The process ID */
+ apr_proc_t *pid;
+ /** When the process should be sent a signal. <PRE>
+ * kill_never -- process is never sent any signals
+ * kill_always -- process is sent SIGKILL on apr_pool_t
cleanup
+ * kill_after_timeout -- SIGTERM, wait 3 seconds, SIGKILL
+ * just_wait -- wait forever for the process to complete
+ * kill_only_once -- send SIGTERM and then wait </PRE>
+ */
+ enum kill_conditions kill_how;
+ /** The next process in the list */
+ struct process_chain *next;
+};
+
#if !APR_POOL_DEBUG
typedef struct allocator_t allocator_t;
typedef struct node_t node_t;
