From 2baec6a946660fa757cf3a06bf01435f3c9d6728 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 23 Aug 2007 21:10:57 +0000 Subject: Changes from arch/CVS synchronization --- ChangeLog | 4 ++++ NEWS | 1 + libguile/ChangeLog | 4 ++++ libguile/stime.c | 4 +++- 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2b9b53729..fa59885d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-08-23 Ludovic Courtès + + * NEWS: Mention Solaris bug fixes. + 2007-08-11 Ludovic Courtès * NEWS: Mention SRFI-35 and the new reader. diff --git a/NEWS b/NEWS index e13f574b0..bef894773 100644 --- a/NEWS +++ b/NEWS @@ -42,6 +42,7 @@ Changes in 1.8.3 (since 1.8.2) * Bugs fixed ** Expressions like "(set! 'x #t)" no longer yield a crash +** Build problems on Solaris fixed * Implementation improvements diff --git a/libguile/ChangeLog b/libguile/ChangeLog index 40a700a8e..09378ff97 100644 --- a/libguile/ChangeLog +++ b/libguile/ChangeLog @@ -1,3 +1,7 @@ +2007-08-23 Ludovic Courtès + + * stime.c: Define `_REENTRANT' only if not already defined. + 2007-08-21 Kevin Ryde * gc-card.c (scm_i_card_statistics): Record scm_tc7_number types as diff --git a/libguile/stime.c b/libguile/stime.c index 39621662c..8487b91ca 100644 --- a/libguile/stime.c +++ b/libguile/stime.c @@ -32,7 +32,9 @@ hard coding __hpux. */ #define _GNU_SOURCE /* ask glibc for everything, in particular strptime */ -#define _REENTRANT /* ask solaris for gmtime_r prototype */ +#ifndef _REENTRANT +# define _REENTRANT /* ask solaris for gmtime_r prototype */ +#endif #ifdef __hpux #define _POSIX_C_SOURCE 199506L /* for gmtime_r prototype */ #endif -- cgit v1.2.3