bjh 02/02/23 04:00:48
Modified: . configure.in
include apr.h.in
locks/os2 Makefile.in
Removed: locks/os2 global_mutex.c
Log:
OS/2: Use APR_PROC_MUTEX_IS_GLOBAL to provide global mutex as an alias for
proc mutex.
Revision Changes Path
1.414 +3 -0 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -r1.413 -r1.414
--- configure.in 22 Feb 2002 03:56:03 -0000 1.413
+++ configure.in 23 Feb 2002 12:00:48 -0000 1.414
@@ -283,6 +283,7 @@
dnl we are using for the more up to date cpu/OS
dnl (ie.. old sparcs)
apr_force_atomic_generic=0
+proc_mutex_is_global=0
config_subdirs="none"
INSTALL_SUBDIRS="none"
@@ -300,6 +301,7 @@
enable_threads="system_threads"
eolstr="\\r\\n"
file_as_socket="0"
+ proc_mutex_is_global=1
;;
*beos*)
OSDIR="beos"
@@ -382,6 +384,7 @@
esac
AC_SUBST(apr_force_atomic_generic)
+AC_SUBST(proc_mutex_is_global)
AC_SUBST(eolstr)
AC_SUBST(INSTALL_SUBDIRS)
1.102 +2 -2 apr/include/apr.h.in
Index: apr.h.in
===================================================================
RCS file: /home/cvs/apr/include/apr.h.in,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- apr.h.in 22 Feb 2002 07:09:26 -0000 1.101
+++ apr.h.in 23 Feb 2002 12:00:48 -0000 1.102
@@ -258,8 +258,8 @@
/* are we going to force the generic atomic operations */
#define APR_FORCE_ATOMIC_GENERIC @apr_force_atomic_generic@
-/* ### aught to actual deploy this for OS2? */
-#define APR_PROC_MUTEX_IS_GLOBAL 0
+/* Does the proc mutex lock threads too */
+#define APR_PROC_MUTEX_IS_GLOBAL @proc_mutex_is_global@
/* Local machine definition for console and log output. */
#define APR_EOL_STR "@eolstr@"
1.18 +1 -2 apr/locks/os2/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/locks/os2/Makefile.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Makefile.in 18 Feb 2002 01:16:04 -0000 1.17
+++ Makefile.in 23 Feb 2002 12:00:48 -0000 1.18
@@ -3,8 +3,7 @@
thread_mutex.lo \
thread_rwlock.lo \
thread_cond.lo \
- proc_mutex.lo \
- global_mutex.lo
+ proc_mutex.lo
# bring in rules.mk for standard functionality
@INCLUDE_RULES@
