You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@hyperreal.org on 1999/12/06 19:58:35 UTC
cvs commit: apache-2.0/src/lib/apr/locks/unix locks.c locks.h
rbb 99/12/06 10:58:29
Modified: src/lib/apr configure.in
src/lib/apr/locks/unix locks.c locks.h
Log:
Finish the cleanup I did earlier. It worked before on AIX, but that was
all luck. This is cleaner anyway, and it should work everywhere.
Revision Changes Path
1.34 +5 -3 apache-2.0/src/lib/apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- configure.in 1999/12/06 18:19:26 1.33
+++ configure.in 1999/12/06 18:58:18 1.34
@@ -153,13 +153,15 @@
AC_SUBST(fcntlser)
AC_SUBST(procpthreadser)
-AC_CHECK_LIB(pthread, pthread_mutex_init, [
+pthreadser="0"
+AC_CHECK_LIB(pthread, pthread_mutex_init, [
AC_DEFINE(USE_PTHREAD_SERIALIZE)
- pthreadser="1" ], [ pthreadser="0" ])
+ pthreadser="1" ])
AC_CHECK_LIB(c_r, pthread_mutex_init, [
AC_DEFINE(USE_PTHREAD_SERIALIZE)
- pthreadser="1" ], [ pthreadser="0" ])
+ pthreadser="1"])
AC_SUBST(pthreadser)
+
ac_cv_define_READDIR_IS_THREAD_SAFE=no
AC_CHECK_LIB(c_r, readdir, AC_DEFINE(READDIR_IS_THREAD_SAFE))
1.16 +3 -3 apache-2.0/src/lib/apr/locks/unix/locks.c
Index: locks.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/locks.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- locks.c 1999/12/03 15:18:27 1.15
+++ locks.c 1999/12/06 18:58:26 1.16
@@ -264,15 +264,15 @@
return APR_ENOLOCK;
}
oslock->crossproc = lock->interproc;
-#if defined (USE_SYSVSEM_SERIALIZE)
+#if USE_SYSVSEM_SERIALIZE
oslock->op_on = lock->op_on;
oslock->op_off = lock->op_off;
-#elif defined (USE_FCNTL_SERIALIZE)
+#elif USE_FCNTL_SERIALIZE
oslock->lock_it = lock->lock_it;
oslock->unlock_it = lock->unlock_it;
#endif
#if APR_HAS_THREADS
-#if defined (USE_PTHREAD_SERIALIZE)
+#if USE_PTHREAD_SERIALIZE
oslock->intraproc = lock->intraproc;
#endif
#endif
1.8 +1 -1 apache-2.0/src/lib/apr/locks/unix/locks.h
Index: locks.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/locks.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- locks.h 1999/12/06 18:19:41 1.7
+++ locks.h 1999/12/06 18:58:28 1.8
@@ -128,7 +128,7 @@
#if APR_HAS_THREADS
/* APR doesn't have threads, no sense in having an thread lock mechanism.
*/
-#if defined (USE_PTHREAD_SERIALIZE)
+#if USE_PTHREAD_SERIALIZE
pthread_mutex_t *intraproc;
#endif
#endif