dreid 01/07/06 23:42:24
Modified: memory/unix apr_sms.c
include apr_sms.h apr_portable.h
Log:
Move the thread registration functions from the apr_sms header into
the portable header as this seems a more logical place for them given they
use apr_os_thread_t. This also simplify's the build process ordering
in certain situations.
BTW, do we still need to add the @deffunc lines as we don't seem to
have been doing in some places. Is this a scandoc change Ben?
Revision Changes Path
1.42 +1 -0 apr/memory/unix/apr_sms.c
Index: apr_sms.c
===================================================================
RCS file: /home/cvs/apr/memory/unix/apr_sms.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- apr_sms.c 2001/07/05 23:32:50 1.41
+++ apr_sms.c 2001/07/07 06:42:23 1.42
@@ -65,6 +65,7 @@
#include "apr_sms.h"
#include <stdlib.h>
#include "sms_private.h"
+#include "apr_portable.h"
#ifdef APR_ASSERT_MEMORY
#include <assert.h>
1.32 +0 -23 apr/include/apr_sms.h
Index: apr_sms.h
===================================================================
RCS file: /home/cvs/apr/include/apr_sms.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- apr_sms.h 2001/07/05 23:32:48 1.31
+++ apr_sms.h 2001/07/07 06:42:23 1.32
@@ -348,29 +348,6 @@
APR_DECLARE(apr_status_t) apr_sms_cleanup_run_type(apr_sms_t *sms,
apr_int32_t type);
-#if APR_HAS_THREADS
-/**
- * Register the specified thread with the sms
- * @param sms The memory system the thread is to be registered with
- * @param thread The thread to register
- * @deffunc apr_status_t apr_sms_thread_register(apr_sms_t *sms,
- * apr_os_thread_t thread);
- */
-APR_DECLARE(apr_status_t) apr_sms_thread_register(apr_sms_t *sms,
- apr_os_thread_t thread);
-
-/**
- * Unregister a previously registered thread from the sms
- * @param sms The memory system the thread is to be unregistered from
- * @param thread The thread to unregister
- * @deffunc apr_status_t apr_sms_thread_unregister(apr_sms_t *sms,
- * apr_os_thread_t thread);
- */
-APR_DECLARE(apr_status_t) apr_sms_thread_unregister(apr_sms_t *sms,
- apr_os_thread_t thread);
-
-#endif /* APR_HAS_THREADS */
-
/**********************************************************************
** Standard SMS module
**********************************************************************/
1.61 +17 -1 apr/include/apr_portable.h
Index: apr_portable.h
===================================================================
RCS file: /home/cvs/apr/include/apr_portable.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- apr_portable.h 2001/07/07 06:34:58 1.60
+++ apr_portable.h 2001/07/07 06:42:23 1.61
@@ -424,8 +424,24 @@
*/
APR_DECLARE(int) apr_os_thread_equal(apr_os_thread_t tid1,
apr_os_thread_t tid2);
-#endif /* APR_HAS_THREADS */
+/**
+ * Register the specified thread with an sms
+ * @param sms The SMS to register with
+ * @param thread The thread to register
+ */
+APR_DECLARE(apr_status_t) apr_sms_thread_register(apr_sms_t *sms,
+ apr_os_thread_t thread);
+
+/**
+ * Unregister a thread from an sms
+ * @param sms The sms to unregister from
+ * @param thread The thread to be unregistered
+ */
+APR_DECLARE(apr_status_t) apr_sms_thread_unregister(apr_sms_t *sms,
+ apr_os_thread_t thread);
+
+#endif /* APR_HAS_THREADS */
#ifdef __cplusplus
}
