Submitted by: Jeremy Allison (jallison@whistle.com)

fix a slight confusion about which draft of threads we are supporting.
this allows something as big and ugly as samba to be compiled with libc_r
and still work!  our user-level pthreads seems amazingly robust!

1 files changed, 5 insertions, 3 deletions

diff --git a/lib/libc/stdtime/localtime.c b/lib/libc/stdtime/localtime.c
index 3438cc673e72..204bac0c9c91 100644
--- a/lib/libc/stdtime/localtime.c
+++ b/lib/libc/stdtime/localtime.c
@@ -1191,9 +1191,11 @@ const time_t * const	timep;
 		}
 	}
 	pthread_mutex_unlock(&gmtime_mutex);
-	if ((p_tm = pthread_getspecific(gmtime_key)) != 0) {
-		return(NULL);
-	} else if (p_tm == NULL) {
+	/*
+	 * Changed to follow draft 4 pthreads standard, which
+	 * is what BSD currently has.
+	 */
+	if ((p_tm = pthread_getspecific(gmtime_key)) == NULL) {
 		if ((p_tm = (struct tm *)malloc(sizeof(struct tm))) == NULL) {
 			return(NULL);
 		}