trawick 02/05/08 06:30:11
Modified: include apr_portable.h
locks/unix global_mutex.c
Log:
APR_PROC_MUTEX_IS_GLOBAL is the condition where apr_global_mutex_t
and apr_proc_mutex_t are interchangeable
currently there aren't any Unix systems with APR_PROC_MUTEX_IS_GLOBAL
is defined... if/when there is, the entire global_mutex.c should be
ignored
Revision Changes Path
1.79 +1 -1 apr/include/apr_portable.h
Index: apr_portable.h
===================================================================
RCS file: /home/cvs/apr/include/apr_portable.h,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- apr_portable.h 2 May 2002 00:52:01 -0000 1.78
+++ apr_portable.h 8 May 2002 13:30:11 -0000 1.79
@@ -218,7 +218,7 @@
typedef struct apr_os_sock_info_t apr_os_sock_info_t;
-#if APR_PROCESS_LOCK_IS_GLOBAL
+#if APR_PROC_MUTEX_IS_GLOBAL
#define apr_os_global_mutex_t apr_os_proc_mutex_t
#define apr_os_global_mutex_get apr_os_proc_mutex_get
#else
1.7 +0 -2 apr/locks/unix/global_mutex.c
Index: global_mutex.c
===================================================================
RCS file: /home/cvs/apr/locks/unix/global_mutex.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- global_mutex.c 6 May 2002 20:02:28 -0000 1.6
+++ global_mutex.c 8 May 2002 13:30:11 -0000 1.7
@@ -179,7 +179,6 @@
return APR_SUCCESS;
}
-#if !APR_PROCESS_LOCK_IS_GLOBAL
APR_DECLARE(apr_status_t) apr_os_global_mutex_get(apr_os_global_mutex_t
*ospmutex,
apr_global_mutex_t *pmutex)
{
@@ -190,7 +189,6 @@
#endif
return APR_SUCCESS;
}
-#endif
APR_DECLARE(apr_status_t) apr_global_mutex_destroy(apr_global_mutex_t *mutex)
{