mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-09 21:40:33 +02:00
Code Activity

Work around `#define except' on Tru64.

Browse source
This commit is contained in:
Ludovic Courtès 2008-06-02 21:43:07 +02:00
parent 90e97a7b4b
commit c4df2cca63
3 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -14,6 +14,8 @@ Changes in 1.8.6 (since 1.8.5)
This makes these internal functions technically not callable from This makes these internal functions technically not callable from
application code. application code.
** Fix build issue on Tru64
Changes in 1.8.5 (since 1.8.4) Changes in 1.8.5 (since 1.8.4)

6
libguile/ChangeLog
View file

@ -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> 2008-05-31 Ludovic Courtès <ludo@gnu.org>
* __scm.h (SCM_INTERNAL): New macro. * __scm.h (SCM_INTERNAL): New macro.

10
libguile/deprecated.c
View file

@ -2,7 +2,7 @@
deprecate something, move it here when that is feasible. 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 * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -319,14 +319,14 @@ scm_load_scheme_module (SCM name)
static void static void
maybe_close_port (void *data, SCM port) 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)) if (scm_is_eq (p, port))
return; return;
except = SCM_CDR (except); except_set = SCM_CDR (except_set);
} }
scm_close_port (port); scm_close_port (port);