Work around `#define except' on Tru64.

diff --git a/NEWS b/NEWS
index 7f46707..a399f23 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -45,6 +45,8 @@ Changes in 1.8.6 (since 1.8.5)
 This makes these internal functions technically not callable from
 application code.
 
+** Fix build issue on Tru64
+
 \f
 Changes in 1.8.5 (since 1.8.4)
 

diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 110b781..1ca6dca 100644 (file)
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-02  Ludovic Courtès  <ludo@gnu.org>
+
+       * deprecated.c (maybe_close_port): Rename EXCEPT to EXCEPT_SET
+       to workaround `#define except' on Tru64.  Reported by Peter
+       O'Gorman <pogma@thewrittenword.com>.
+
 2008-05-31  Ludovic Courtès  <ludo@gnu.org>
 
        * __scm.h (SCM_INTERNAL): New macro.

diff --git a/libguile/deprecated.c b/libguile/deprecated.c
index bb17967..da11608 100644 (file)
--- a/libguile/deprecated.c
+++ b/libguile/deprecated.c
@@ -2,7 +2,7 @@
    deprecate something, move it here when that is feasible.
 */
 
-/* Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2004, 2006, 2008 Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -319,14 +319,14 @@ scm_load_scheme_module (SCM name)
 static void
 maybe_close_port (void *data, SCM port)
 {
-  SCM except = (SCM)data;
+  SCM except_set = (SCM) data;
 
-  while (!scm_is_null (except))
+  while (!scm_is_null (except_set))
     {
-      SCM p = SCM_COERCE_OUTPORT (SCM_CAR (except));
+      SCM p = SCM_COERCE_OUTPORT (SCM_CAR (except_set));
       if (scm_is_eq (p, port))
        return;
-      except = SCM_CDR (except);
+      except_set = SCM_CDR (except_set);
     }
 
   scm_close_port (port);