Changes from arch/CVS synchronization

diff --git a/ChangeLog b/ChangeLog
index 2b9b537..fa59885 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-23  Ludovic Courtès  <ludo@gnu.org>
+
+       * NEWS: Mention Solaris bug fixes.
+
 2007-08-11  Ludovic Courtès  <ludo@gnu.org>
 
        * NEWS: Mention SRFI-35 and the new reader.

diff --git a/NEWS b/NEWS
index e13f574..bef8947 100644 (file)
--- 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 40a700a..09378ff 100644 (file)
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-23  Ludovic Courtès  <ludo@gnu.org>
+
+       * stime.c: Define `_REENTRANT' only if not already defined.
+
 2007-08-21  Kevin Ryde  <user42@zip.com.au>
 
        * gc-card.c (scm_i_card_statistics): Record scm_tc7_number types as

diff --git a/libguile/stime.c b/libguile/stime.c
index 3962166..8487b91 100644 (file)
--- 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