rse 99/10/31 08:18:36
Modified: src/lib/apr/time/unix time.c
src/lib/apr/file_io/unix dir.c
Log:
Be careful, _POSIX_THREAD_SAFE_FUNCTIONS is a feature test macro, yes, but it
works by being either defined or not. It's not always defined and just has a
value 0 or not 0...
Revision Changes Path
1.11 +2 -2 apache-2.0/src/lib/apr/time/unix/time.c
Index: time.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/time/unix/time.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- time.c 1999/10/19 19:21:22 1.10
+++ time.c 1999/10/31 16:18:35 1.11
@@ -107,7 +107,7 @@
{
switch (type) {
case APR_LOCALTIME: {
-#if APR_HAS_THREADS && _POSIX_THREAD_SAFE_FUNCTIONS
+#if APR_HAS_THREADS && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
localtime_r(&atime->currtime->tv_sec, atime->explodedtime);
#else
atime->explodedtime = localtime(&atime->currtime->tv_sec);
@@ -115,7 +115,7 @@
break;
}
case APR_UTCTIME: {
-#if APR_HAS_THREADS && _POSIX_THREAD_SAFE_FUNCTIONS
+#if APR_HAS_THREADS && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
gmtime_r(&atime->currtime->tv_sec, atime->explodedtime);
#else
atime->explodedtime = gmtime(&atime->currtime->tv_sec);
1.14 +1 -1 apache-2.0/src/lib/apr/file_io/unix/dir.c
Index: dir.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/dir.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- dir.c 1999/10/23 21:23:20 1.13
+++ dir.c 1999/10/31 16:18:36 1.14
@@ -124,7 +124,7 @@
*/
ap_status_t ap_readdir(struct dir_t *thedir)
{
-#if APR_HAS_THREADS && _POSIX_THREAD_SAFE_FUNCTIONS
+#if APR_HAS_THREADS && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
ap_status_t ret;
ret = readdir_r(thedir->dirstruct, thedir->entry, &thedir->entry);
/* Avoid the Linux problem where at end-of-directory thedir->entry
