summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libguile/COPYING9
-rw-r--r--libguile/ChangeLog33
-rw-r--r--libguile/__scm.h6
-rw-r--r--libguile/_scm.h6
-rw-r--r--libguile/alist.c6
-rw-r--r--libguile/alist.h6
-rw-r--r--libguile/append.c78
-rw-r--r--libguile/append.h55
-rw-r--r--libguile/appinit.c52
-rw-r--r--libguile/arbiters.c6
-rw-r--r--libguile/arbiters.h6
-rw-r--r--libguile/async.c6
-rw-r--r--libguile/async.h6
-rw-r--r--libguile/backtrace.c6
-rw-r--r--libguile/backtrace.h6
-rw-r--r--libguile/boolean.c6
-rw-r--r--libguile/boolean.h6
-rw-r--r--libguile/chars.c6
-rw-r--r--libguile/chars.h6
-rw-r--r--libguile/continuations.c6
-rw-r--r--libguile/continuations.h6
-rw-r--r--libguile/coop-defs.h6
-rw-r--r--libguile/coop-threads.c6
-rw-r--r--libguile/coop-threads.c.cygnus469
-rw-r--r--libguile/coop-threads.h6
-rw-r--r--libguile/coop-threads.h.cygnus223
-rw-r--r--libguile/coop.c8
-rw-r--r--libguile/debug.c6
-rw-r--r--libguile/debug.h6
-rw-r--r--libguile/dynl-dl.c6
-rw-r--r--libguile/dynl-dld.c6
-rw-r--r--libguile/dynl-shl.c6
-rw-r--r--libguile/dynl-vms.c6
-rw-r--r--libguile/dynl.c6
-rw-r--r--libguile/dynl.h6
-rw-r--r--libguile/dynwind.c6
-rw-r--r--libguile/dynwind.h6
-rw-r--r--libguile/eq.c6
-rw-r--r--libguile/eq.h6
-rw-r--r--libguile/error.c6
-rw-r--r--libguile/error.h6
-rw-r--r--libguile/eval.c6
-rw-r--r--libguile/eval.h6
-rw-r--r--libguile/extchrs.h6
-rw-r--r--libguile/feature.c6
-rw-r--r--libguile/feature.h6
-rw-r--r--libguile/filesys.c6
-rw-r--r--libguile/filesys.h6
-rw-r--r--libguile/fports.c6
-rw-r--r--libguile/fports.h6
-rw-r--r--libguile/fsu-pthreads.h6
-rw-r--r--libguile/gc.c6
-rw-r--r--libguile/gc.h6
-rw-r--r--libguile/gdbint.c6
-rw-r--r--libguile/gdbint.h6
-rw-r--r--libguile/genio.c6
-rw-r--r--libguile/genio.h6
-rw-r--r--libguile/gh.h6
-rw-r--r--libguile/gh_data.c6
-rw-r--r--libguile/gh_eval.c6
-rw-r--r--libguile/gh_funcs.c6
-rw-r--r--libguile/gh_init.c6
-rw-r--r--libguile/gh_io.c6
-rw-r--r--libguile/gh_list.c6
-rw-r--r--libguile/gh_predicates.c6
-rw-r--r--libguile/gh_test_c.c6
-rw-r--r--libguile/gh_test_repl.c6
-rw-r--r--libguile/gscm.c6
-rw-r--r--libguile/gscm.h281
-rw-r--r--libguile/gsubr.c6
-rw-r--r--libguile/gsubr.h6
-rw-r--r--libguile/guile.c6
-rw-r--r--libguile/hash.c6
-rw-r--r--libguile/hash.h6
-rw-r--r--libguile/hashtab.c6
-rw-r--r--libguile/hashtab.h6
-rw-r--r--libguile/init.c6
-rw-r--r--libguile/init.h6
-rw-r--r--libguile/ioext.c6
-rw-r--r--libguile/ioext.h6
-rw-r--r--libguile/kw.c6
-rw-r--r--libguile/kw.h63
-rw-r--r--libguile/libguile.h6
-rw-r--r--libguile/list.c6
-rw-r--r--libguile/list.h6
-rw-r--r--libguile/load.c6
-rw-r--r--libguile/load.h6
-rw-r--r--libguile/mallocs.c4
-rw-r--r--libguile/mallocs.h6
-rw-r--r--libguile/markers.c6
-rw-r--r--libguile/markers.h59
-rw-r--r--libguile/mbstrings.c6
-rw-r--r--libguile/mbstrings.h6
-rw-r--r--libguile/mit-pthreads.c6
-rw-r--r--libguile/mit-pthreads.h6
-rw-r--r--libguile/net_db.c6
-rw-r--r--libguile/net_db.h6
-rw-r--r--libguile/numbers.c6
-rw-r--r--libguile/numbers.h6
-rw-r--r--libguile/objprop.c6
-rw-r--r--libguile/objprop.h6
-rw-r--r--libguile/options.c6
-rw-r--r--libguile/options.h6
-rw-r--r--libguile/pairs.c6
-rw-r--r--libguile/pairs.h6
-rw-r--r--libguile/ports.c6
-rw-r--r--libguile/ports.h6
-rw-r--r--libguile/posix.c6
-rw-r--r--libguile/posix.h6
-rw-r--r--libguile/print.c6
-rw-r--r--libguile/print.h6
-rw-r--r--libguile/procprop.c6
-rw-r--r--libguile/procprop.h6
-rw-r--r--libguile/procs.c6
-rw-r--r--libguile/procs.h6
-rw-r--r--libguile/putenv.c3
-rw-r--r--libguile/ramap.c6
-rw-r--r--libguile/ramap.h6
-rw-r--r--libguile/read.c6
-rw-r--r--libguile/read.h6
-rw-r--r--libguile/root.c6
-rw-r--r--libguile/root.h6
-rw-r--r--libguile/scmhob.h4
-rw-r--r--libguile/scmsigs.c6
-rw-r--r--libguile/scmsigs.h6
-rw-r--r--libguile/script.c6
-rw-r--r--libguile/script.h6
-rw-r--r--libguile/sequences.c113
-rw-r--r--libguile/sequences.h59
-rw-r--r--libguile/simpos.c6
-rw-r--r--libguile/simpos.h6
-rw-r--r--libguile/smob.c6
-rw-r--r--libguile/smob.h6
-rw-r--r--libguile/snarf.h3
-rw-r--r--libguile/socket.c6
-rw-r--r--libguile/socket.h6
-rw-r--r--libguile/srcprop.c6
-rw-r--r--libguile/srcprop.h6
-rw-r--r--libguile/stackchk.c6
-rw-r--r--libguile/stackchk.h6
-rw-r--r--libguile/stacks.c6
-rw-r--r--libguile/stacks.h6
-rw-r--r--libguile/stime.c6
-rw-r--r--libguile/stime.h6
-rw-r--r--libguile/strings.c6
-rw-r--r--libguile/strings.h6
-rw-r--r--libguile/strop.c5
-rw-r--r--libguile/strop.h6
-rw-r--r--libguile/strorder.c6
-rw-r--r--libguile/strorder.h6
-rw-r--r--libguile/strports.c6
-rw-r--r--libguile/strports.h6
-rw-r--r--libguile/struct.c6
-rw-r--r--libguile/struct.h6
-rw-r--r--libguile/symbols.c6
-rw-r--r--libguile/symbols.h6
-rw-r--r--libguile/tag.c6
-rw-r--r--libguile/tag.h6
-rw-r--r--libguile/tags.h6
-rw-r--r--libguile/threads.c6
-rw-r--r--libguile/threads.h6
-rw-r--r--libguile/throw.c6
-rw-r--r--libguile/throw.h6
-rw-r--r--libguile/unif.c6
-rw-r--r--libguile/unif.h6
-rw-r--r--libguile/variable.c6
-rw-r--r--libguile/variable.h6
-rw-r--r--libguile/vectors.c6
-rw-r--r--libguile/vectors.h6
-rw-r--r--libguile/version.c6
-rw-r--r--libguile/version.h6
-rw-r--r--libguile/vports.c6
-rw-r--r--libguile/vports.h6
-rw-r--r--libguile/weaks.c6
-rw-r--r--libguile/weaks.h6
175 files changed, 524 insertions, 1939 deletions
diff --git a/libguile/COPYING b/libguile/COPYING
index 9648fb9ea..eeb586b39 100644
--- a/libguile/COPYING
+++ b/libguile/COPYING
@@ -1,8 +1,8 @@
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
- Copyright (C) 1989, 1991, 1992, 1993 Free Software Foundation, Inc.
- 675 Mass Ave, Cambridge, MA 02139, USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -279,7 +279,7 @@ POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
- Appendix: How to Apply These Terms to Your New Programs
+ How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
@@ -305,7 +305,8 @@ the "copyright" line and a pointer to where the full notice is found.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
Also add information on how to contact you by electronic and paper mail.
diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index d940f54ca..e8fde18ae 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,36 @@
+Mon May 26 17:24:38 1997 Jim Blandy <jimb@totoro.cyclic.com>
+
+ * COPYING, __scm.h, _scm.h, alist.c, alist.h, append.c, append.h,
+ appinit.c, arbiters.c, arbiters.h, async.c, async.h, backtrace.c,
+ backtrace.h, boolean.c, boolean.h, chars.c, chars.h,
+ continuations.c, continuations.h, coop-defs.h, coop-threads.c,
+ coop-threads.c.cygnus, coop-threads.h, coop-threads.h.cygnus,
+ coop.c, debug.c, debug.h, dynl-dl.c, dynl-dld.c, dynl-shl.c,
+ dynl-vms.c, dynl.c, dynl.h, dynwind.c, dynwind.h, eq.c, eq.h,
+ error.c, error.h, eval.c, eval.h, extchrs.h, feature.c, feature.h,
+ filesys.c, filesys.h, fports.c, fports.h, fsu-pthreads.h, gc.c,
+ gc.h, gdbint.c, gdbint.h, genio.c, genio.h, gh.h, gh_data.c,
+ gh_eval.c, gh_funcs.c, gh_init.c, gh_io.c, gh_list.c,
+ gh_predicates.c, gh_test_c.c, gh_test_repl.c, gscm.c, gscm.h,
+ gsubr.c, gsubr.h, guile.c, hash.c, hash.h, hashtab.c, hashtab.h,
+ init.c, init.h, ioext.c, ioext.h, kw.c, kw.h, libguile.h, list.c,
+ list.h, load.c, load.h, mallocs.c, mallocs.h, markers.c,
+ markers.h, mbstrings.c, mbstrings.h, mit-pthreads.c,
+ mit-pthreads.h, net_db.c, net_db.h, numbers.c, numbers.h,
+ objprop.c, objprop.h, options.c, options.h, pairs.c, pairs.h,
+ ports.c, ports.h, posix.c, posix.h, print.c, print.h, procprop.c,
+ procprop.h, procs.c, procs.h, putenv.c, ramap.c, ramap.h, read.c,
+ read.h, root.c, root.h, scmhob.h, scmsigs.c, scmsigs.h, script.c,
+ script.h, sequences.c, sequences.h, simpos.c, simpos.h, smob.c,
+ smob.h, snarf.h, socket.c, socket.h, srcprop.c, srcprop.h,
+ stackchk.c, stackchk.h, stacks.c, stacks.h, stime.c, stime.h,
+ strings.c, strings.h, strop.c, strop.h, strorder.c, strorder.h,
+ strports.c, strports.h, struct.c, struct.h, symbols.c, symbols.h,
+ tag.c, tag.h, tags.h, threads.c, threads.h, throw.c, throw.h,
+ unif.c, unif.h, variable.c, variable.h, vectors.c, vectors.h,
+ version.c, version.h, vports.c, vports.h, weaks.c, weaks.h: New
+ address for FSF.
+
Mon May 26 12:37:30 1997 Jim Blandy <jimb@floss.cyclic.com>
* script.c (scm_find_executable): Use prototype-style definition
diff --git a/libguile/__scm.h b/libguile/__scm.h
index 52d175ead..f265e2104 100644
--- a/libguile/__scm.h
+++ b/libguile/__scm.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
/* {Supported Options}
*
diff --git a/libguile/_scm.h b/libguile/_scm.h
index 5d5b429dd..2798c2090 100644
--- a/libguile/_scm.h
+++ b/libguile/_scm.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "__scm.h"
diff --git a/libguile/alist.c b/libguile/alist.c
index 06ede611a..4a375c945 100644
--- a/libguile/alist.c
+++ b/libguile/alist.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
#include "_scm.h"
diff --git a/libguile/alist.h b/libguile/alist.h
index 87e327fdd..058fe512c 100644
--- a/libguile/alist.h
+++ b/libguile/alist.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/append.c b/libguile/append.c
index 204d57ab8..e69de29bb 100644
--- a/libguile/append.c
+++ b/libguile/append.c
@@ -1,78 +0,0 @@
-/* Copyright (C) 1995,1996 Free Software Foundation, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * As a special exception, the Free Software Foundation gives permission
- * for additional uses of the text contained in its release of GUILE.
- *
- * The exception is that, if you link the GUILE library with other files
- * to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE. If you copy
- * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
- * not apply to the code that you add in this way. To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
- *
- * If you write modifications of your own for GUILE, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
-
-
-#include <stdio.h>
-#include "_scm.h"
-#include "list.h"
-
-#include "append.h"
-
-
-
-SCM_PROC (s_append, "append", 0, 0, 1, scm_append);
-
-SCM
-scm_append (objs)
- SCM objs;
-{
- return scm_list_append (objs);
-}
-
-
-SCM_PROC (s_append_x, "append!", 0, 0, 1, scm_append_x);
-
-SCM
-scm_append_x (objs)
- SCM objs;
-{
- return scm_list_append_x (objs);
-}
-
-
-
-
-void
-scm_init_append ()
-{
-#include "append.x"
-}
-
diff --git a/libguile/append.h b/libguile/append.h
index 9c13d6356..e69de29bb 100644
--- a/libguile/append.h
+++ b/libguile/append.h
@@ -1,55 +0,0 @@
-/* classes: h_files */
-
-#ifndef APPENDH
-#define APPENDH
-/* Copyright (C) 1995,1996 Free Software Foundation, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * As a special exception, the Free Software Foundation gives permission
- * for additional uses of the text contained in its release of GUILE.
- *
- * The exception is that, if you link the GUILE library with other files
- * to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE. If you copy
- * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
- * not apply to the code that you add in this way. To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
- *
- * If you write modifications of your own for GUILE, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
-
-
-#include "libguile/__scm.h"
-
-
-
-extern SCM scm_append SCM_P ((SCM objs));
-extern SCM scm_append_x SCM_P ((SCM objs));
-extern void scm_init_append SCM_P ((void));
-
-#endif /* APPENDH */
diff --git a/libguile/appinit.c b/libguile/appinit.c
index 1dff367f3..e69de29bb 100644
--- a/libguile/appinit.c
+++ b/libguile/appinit.c
@@ -1,52 +0,0 @@
-/* Copyright (C) 1996 Free Software Foundation, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * As a special exception, the Free Software Foundation gives permission
- * for additional uses of the text contained in its release of GUILE.
- *
- * The exception is that, if you link the GUILE library with other files
- * to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE. If you copy
- * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
- * not apply to the code that you add in this way. To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
- *
- * If you write modifications of your own for GUILE, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
-
-
-#include <stdio.h>
-#include "_scm.h"
-
-
-
-
-void
-scm_appinit ()
-{
-}
diff --git a/libguile/arbiters.c b/libguile/arbiters.c
index 4c5b966c7..ab1b70386 100644
--- a/libguile/arbiters.c
+++ b/libguile/arbiters.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/arbiters.h b/libguile/arbiters.h
index 5e34ce297..19359791d 100644
--- a/libguile/arbiters.h
+++ b/libguile/arbiters.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/async.c b/libguile/async.c
index d49755c43..2e4960ab5 100644
--- a/libguile/async.c
+++ b/libguile/async.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/async.h b/libguile/async.h
index 80c02401d..ffb7d9346 100644
--- a/libguile/async.h
+++ b/libguile/async.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/backtrace.c b/libguile/backtrace.c
index c1c6f216c..cdd968d15 100644
--- a/libguile/backtrace.c
+++ b/libguile/backtrace.c
@@ -13,7 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
* If you do not wish that, delete this exception notice.
*
* The author can be reached at djurfeldt@nada.kth.se
- * Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN
- */
+ * Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN */
#include <stdio.h>
#include "_scm.h"
diff --git a/libguile/backtrace.h b/libguile/backtrace.h
index 831505588..fad89ec37 100644
--- a/libguile/backtrace.h
+++ b/libguile/backtrace.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -43,8 +44,7 @@
* If you do not wish that, delete this exception notice.
*
* The author can be reached at djurfeldt@nada.kth.se
- * Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN
- */
+ * Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN */
#include "libguile/__scm.h"
diff --git a/libguile/boolean.c b/libguile/boolean.c
index 3267f28eb..a9527a278 100644
--- a/libguile/boolean.c
+++ b/libguile/boolean.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/boolean.h b/libguile/boolean.h
index c9945e566..52a28b559 100644
--- a/libguile/boolean.h
+++ b/libguile/boolean.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/chars.c b/libguile/chars.c
index cc77d3d09..186c88730 100644
--- a/libguile/chars.c
+++ b/libguile/chars.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/chars.h b/libguile/chars.h
index 8ad7672d3..7c1152d72 100644
--- a/libguile/chars.h
+++ b/libguile/chars.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/continuations.c b/libguile/continuations.c
index f04912c8a..846f68fdd 100644
--- a/libguile/continuations.c
+++ b/libguile/continuations.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/continuations.h b/libguile/continuations.h
index 0bd18296e..f37058366 100644
--- a/libguile/continuations.h
+++ b/libguile/continuations.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/coop-defs.h b/libguile/coop-defs.h
index d9a6b9eec..79c48b5be 100644
--- a/libguile/coop-defs.h
+++ b/libguile/coop-defs.h
@@ -17,7 +17,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -41,8 +42,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
# ifdef TIME_WITH_SYS_TIME
diff --git a/libguile/coop-threads.c b/libguile/coop-threads.c
index a8860fc62..6570e9bbe 100644
--- a/libguile/coop-threads.c
+++ b/libguile/coop-threads.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "coop-threads.h"
diff --git a/libguile/coop-threads.c.cygnus b/libguile/coop-threads.c.cygnus
index 5393d6fe0..e69de29bb 100644
--- a/libguile/coop-threads.c.cygnus
+++ b/libguile/coop-threads.c.cygnus
@@ -1,469 +0,0 @@
-/* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * As a special exception, the Free Software Foundation gives permission
- * for additional uses of the text contained in its release of GUILE.
- *
- * The exception is that, if you link the GUILE library with other files
- * to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE. If you copy
- * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
- * not apply to the code that you add in this way. To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
- *
- * If you write modifications of your own for GUILE, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
-
-
-/* A counter of the current number of threads */
-size_t scm_thread_count = 0;
-
-/* This is included rather than compiled seperately in order
- to simplify the configuration mechanism. */
-#include "coop.c"
-
-/* A count-down counter used to determine when to switch
- contexts */
-size_t scm_switch_counter = SCM_THREAD_SWITCH_COUNT;
-
-coop_m scm_critical_section_mutex;
-
-static struct gscm_type scm_thread_type;
-static struct gscm_type scm_mutex_type;
-static struct gscm_type scm_condition_variable_type;
-
-/* This mutex is used to synchronize thread creation */
-static coop_m scm_coop_create_mutex;
-
-/* Support structure for thread creation */
-struct scm_coop_create_info_type scm_coop_create_info;
-
-#ifdef __STDC__
-int
-gscm_threads_thread_equal (SCM t1, SCM t2)
-#else
-int
-gscm_threads_thread_equal (t1, t2)
- SCM t1, t2;
-#endif
-{
- return (*(coop_t **) gscm_unwrap_obj (&scm_thread_type, &t1) ==
- *(coop_t **) gscm_unwrap_obj (&scm_thread_type, &t2));
-}
-
-#ifdef __STDC__
-void
-gscm_threads_thread_die (SCM t)
-#else
-void
-gscm_threads_thread_die (t)
- SCM t;
-#endif
-{
- coop_t **thread = (coop_t **) gscm_unwrap_obj (&scm_thread_type, &t);
- free(*thread);
-}
-
-#ifdef __STDC__
-void
-gscm_threads_mutex_die (SCM m)
-#else
-void
-gscm_threads_scm_mutex_die (m)
- SCM m;
-#endif
-{
- /* He's dead, Jim */
-}
-
-#ifdef __STDC__
-void
-gscm_threads_condition_variable_die (SCM c)
-#else
-void
-gscm_threads_condition_variable_die (c)
- SCM c;
-#endif
-{
- /* He's dead, Jim */
-}
-
-#ifdef __STDC__
-void
-gscm_threads_init ()
-#else
-void
-gscm_threads_init ()
-#endif
-{
-}
-
-/* cleanup for info structure
- */
-#ifdef __STDC__
-static void
-scm_pthread_delete_info (void *ptr)
-#else
-static void
-scm_pthread_delete_info (ptr)
- void *ptr;
-#endif
-{
-}
-
-#ifdef __STDC__
-void
-gscm_threads_init_coop_threads ()
-#else
-void
-gscm_threads_init_coop_threads ()
-#endif
-{
- SCM *prots;
-
- coop_init();
-
- scm_thread_count = 1;
-
- prots = (SCM *)malloc (sizeof (SCM) * scm_num_thread_local_protects);
-
- coop_global_main.sto = &prots;
- coop_global_main.base = &prots;
- coop_global_curr = &coop_global_main;
- coop_all_qput (&coop_global_allq, coop_global_curr);
-
- coop_mutex_init(&scm_coop_create_mutex);
- coop_mutex_init(&scm_critical_section_mutex);
-
- coop_global_main.data = prots;
-
- /* Initialize the root thread specific data pointer. All new threads
- get a copy of this buffer.
- scm_root_prots = prots; */
-}
-
-#ifdef __STDC__
-void
-gscm_threads_mark_stacks ()
-#else
-void
-gscm_threads_mark_stacks ()
-#endif
-{
- coop_t *thread;
- int j;
- jmp_buf scm_save_regs_gc_mark;
-
- for (thread = coop_global_allq.t.all_next;
- thread != NULL; thread = thread->all_next)
- {
- if (thread == coop_global_curr)
- {
- /* Active thread */
- /* stack_len is long rather than sizet in order to guarantee
- that &stack_len is long aligned */
-#ifdef STACK_GROWS_UP
- long stack_len = (STACKITEM *) (&thread) -
- (STACKITEM *) thread->base;
-
- /* Protect from the C stack. This must be the first marking
- * done because it provides information about what objects
- * are "in-use" by the C code. "in-use" objects are those
- * for which the values from LENGTH and CHARS must remain
- * usable. This requirement is stricter than a liveness
- * requirement -- in particular, it constrains the implementation
- * of scm_resizuve.
- */
- FLUSH_REGISTER_WINDOWS;
- /* This assumes that all registers are saved into the jmp_buf */
- setjmp (scm_save_regs_gc_mark);
- scm_mark_locations ((STACKITEM *) scm_save_regs_gc_mark,
- ((sizet) sizeof scm_save_regs_gc_mark
- / sizeof (STACKITEM)), BOOL_T);
-
- scm_mark_locations (((size_t) thread->base,
- (sizet) stack_len, BOOL_T));
-#else
- long stack_len = (STACKITEM *) thread->base -
- (STACKITEM *) (&thread);
-
- /* Protect from the C stack. This must be the first marking
- * done because it provides information about what objects
- * are "in-use" by the C code. "in-use" objects are those
- * for which the values from LENGTH and CHARS must remain
- * usable. This requirement is stricter than a liveness
- * requirement -- in particular, it constrains the implementation
- * of scm_resizuve.
- */
- FLUSH_REGISTER_WINDOWS;
- /* This assumes that all registers are saved into the jmp_buf */
- setjmp (scm_save_regs_gc_mark);
- scm_mark_locations ((STACKITEM *) scm_save_regs_gc_mark,
- ((sizet) sizeof scm_save_regs_gc_mark
- / sizeof (STACKITEM)), BOOL_T);
-
- scm_mark_locations ((STACKITEM *) &thread,
- stack_len, BOOL_T);
-#endif
- }
- else
- {
- /* Suspended thread */
-#ifdef STACK_GROWS_UP
- long stack_len = (STACKITEM *) (thread->sp) -
- (STACKITEM *) thread->base;
-
- scm_mark_locations (((size_t)thread->base,
- (sizet) stack_len, BOOL_T));
-#else
- long stack_len = (STACKITEM *) thread->base -
- (STACKITEM *) (thread->sp);
-
- /* Registers are already on the stack. No need to mark. */
-
- scm_mark_locations ((STACKITEM *) (size_t)thread->sp,
- stack_len, BOOL_T);
-#endif
- }
-
- /* Mark all the of this thread's thread-local protects */
- for (j = scm_num_thread_local_protects-1; j >= 0; j--)
- {
- scm_gc_mark (((SCM*)(thread->data))[j], BOOL_F);
- }
- }
-}
-
-#ifdef __STDC__
-void
-launch_thread (void *p)
-#else
-void
-launch_thread (p)
- void *p;
-#endif
-{
- SCM thunk = scm_coop_create_info.thunk;
- SCM error = scm_coop_create_info.error;
-
- /* dynwinds must be set to BOOL_F for each new thread
- (it is a thread-local variable) */
- dynwinds = BOOL_F;
-
- coop_mutex_unlock(&scm_coop_create_mutex);
-
- scm_with_dynamic_root (thunk, error);
-
- scm_thread_count--;
-}
-
-#ifdef __STDC__
-SCM
-gscm_threads_with_new_thread (SCM thunk, SCM error_thunk)
-#else
-SCM
-gscm_threads_with_new_thread (thunk, error_thunk)
- SCM thunk;
- SCM error_thunk;
-#endif
-{
- int rc;
- SCM t = gscm_alloc (&scm_thread_type, sizeof(coop_t *));
-
- coop_t **pt = (coop_t **) gscm_unwrap_obj (&scm_thread_type, &t);
-
- int status;
-
- /* Rather than allocate space to hold fn and arg, a mutex is used
- to serialize thread creation. */
- coop_mutex_lock(&scm_coop_create_mutex);
-
- /* this data is passed to the newly created thread */
- scm_coop_create_info.thunk = thunk;
- scm_coop_create_info.error = error_thunk;
-
- *pt = coop_create(launch_thread, &scm_coop_create_info);
- scm_thread_count++;
-
- {
- SCM * prots;
-
- prots = (SCM *)malloc (sizeof (SCM) * scm_num_thread_local_protects);
-
- (*pt)->data = prots;
-
- /* Copy root thread specific data over */
- memcpy(prots, (SCM*)coop_global_curr->data,
- sizeof (SCM) * scm_num_thread_local_protects);
-
- prots[SCM_THREAD_T] = t;
- prots[SCM_THREAD_THUNK] = thunk;
- prots[SCM_THREAD_ERROR] = error_thunk;
- }
-
- /* we're now ready for the thread to begin */
- coop_yield();
-
- return t;
-}
-
-#ifdef __STDC__
-SCM
-gscm_threads_join_thread (SCM t)
-#else
-SCM
-gscm_threads_join_thread (t)
- SCM t;
-#endif
-{
- coop_t **thread = (coop_t **) gscm_unwrap_obj (&scm_thread_type, &t);
-
- coop_join(*thread);
-
- return SCM_BOOL_T;
-}
-
-#ifdef __STDC__
-SCM
-gscm_threads_make_mutex ()
-#else
-SCM
-gscm_threads_make_mutex ()
-#endif
-{
- SCM t = gscm_alloc (&scm_mutex_type, sizeof(coop_m));
-
- coop_m *m = (coop_m *) gscm_unwrap_obj (&scm_mutex_type, &t);
-
- coop_mutex_init(m);
-
- return t;
-}
-
-#ifdef __STDC__
-SCM
-gscm_threads_lock_mutex (SCM m)
-#else
-SCM
-gscm_threads_lock_mutex (m)
- SCM m;
-#endif
-{
- coop_m *mutex = (coop_m *) gscm_unwrap_obj (&scm_mutex_type, &m);
-
- coop_mutex_lock(mutex);
-
- return SCM_BOOL_T;
-}
-
-#ifdef __STDC__
-SCM
-gscm_threads_unlock_mutex (SCM m)
-#else
-SCM
-gscm_threads_unlock_mutex (m)
- SCM m;
-#endif
-{
- coop_m *mutex = (coop_m *) gscm_unwrap_obj (&scm_mutex_type, &m);
-
- coop_mutex_unlock(mutex);
-
- /* Yield early */
- scm_switch_counter = SCM_THREAD_SWITCH_COUNT;
- coop_yield();
-
- return SCM_BOOL_T;
-}
-
-#ifdef __STDC__
-SCM
-gscm_threads_make_condition_variable ()
-#else
-SCM
-gscm_threads_make_condition_variable ()
-#endif
-{
- SCM t = gscm_alloc (&scm_mutex_type, sizeof(coop_c));
-
- coop_c *c = (coop_c *) gscm_unwrap_obj (&scm_condition_variable_type, &t);
-
- coop_condition_variable_init(c);
-
- return t;
-}
-
-#ifdef __STDC__
-SCM
-gscm_threads_condition_variable_wait (SCM c, SCM m)
-#else
-SCM
-gscm_threads_condition_variable_wait (c, m)
- SCM c;
- SCM m;
-#endif
-{
- coop_c *cv = (coop_c *) gscm_unwrap_obj (&scm_condition_variable_type, &c);
- coop_m *mutex = (coop_m *) gscm_unwrap_obj (&scm_mutex_type, &m);
-
- coop_mutex_unlock(mutex);
- coop_condition_variable_wait(cv);
-
- return SCM_BOOL_T;
-}
-
-#ifdef __STDC__
-SCM
-gscm_threads_condition_variable_signal (SCM c)
-#else
-SCM
-gscm_threads_condition_variable_signal (c)
- SCM c;
-#endif
-{
- coop_c *cv = (coop_c *) gscm_unwrap_obj (&scm_condition_variable_type, &c);
-
- coop_condition_variable_signal(cv);
-
- return SCM_BOOL_T;
-}
-
-#ifdef __STDC__
-SCM
-gscm_threads_yield ()
-#else
-SCM
-gscm_threads_yield ()
-#endif
-{
- /* Yield early */
- scm_switch_counter = SCM_THREAD_SWITCH_COUNT;
- coop_yield();
-
- return SCM_BOOL_T;
-}
diff --git a/libguile/coop-threads.h b/libguile/coop-threads.h
index 0d9678eb4..f67160808 100644
--- a/libguile/coop-threads.h
+++ b/libguile/coop-threads.h
@@ -17,7 +17,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -41,8 +42,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
/* This file is only included by coop-threads.c while coop-defs.h is
diff --git a/libguile/coop-threads.h.cygnus b/libguile/coop-threads.h.cygnus
index bf72e824a..e69de29bb 100644
--- a/libguile/coop-threads.h.cygnus
+++ b/libguile/coop-threads.h.cygnus
@@ -1,223 +0,0 @@
-/* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * As a special exception, the Free Software Foundation gives permission
- * for additional uses of the text contained in its release of GUILE.
- *
- * The exception is that, if you link the GUILE library with other files
- * to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE. If you copy
- * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
- * not apply to the code that you add in this way. To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
- *
- * If you write modifications of your own for GUILE, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
-
-
-#ifndef GSCM_COOP_THREADS_H
-#define GSCM_COOP_THREADS_H
-
-#include <qt.h>
-#include <time.h>
-
-/* This code is based on a sample thread libraru by David Keppel.
- Portions of this file fall under the following copyright: */
-
-/*
- * QuickThreads -- Threads-building toolkit.
- * Copyright (c) 1993 by David Keppel
- *
- * Permission to use, copy, modify and distribute this software and
- * its documentation for any purpose and without fee is hereby
- * granted, provided that the above copyright notice and this notice
- * appear in all copies. This software is provided as a
- * proof-of-concept and for demonstration purposes; there is no
- * representation about the suitability of this software for any
- * purpose.
- */
-
-/* The notion of a thread is merged with the notion of a queue.
- Thread stuff: thread status (sp) and stuff to use during
- (re)initialization. Queue stuff: next thread in the queue
- (next). */
-
-typedef struct coop_t {
- qt_t *sp; /* QuickThreads handle. */
- void *sto; /* `malloc'-allocated stack. */
-
- struct coop_t *next; /* Next thread in the queue. */
-
- struct coop_t *all_next;
- struct coop_t *all_prev;
-
- void *data; /* Thread local data */
-
- void *base; /* Base of stack */
- void *top; /* Top of stack */
-
- void *joining; /* A queue of threads waiting to join this
- thread */
-
- time_t wakeup_time; /* Time to stop sleeping */
-
-} coop_t;
-
-/* A queue is a circular list of threads. The queue head is a
- designated list element. If this is a uniprocessor-only
- implementation we can store the `main' thread in this, but in a
- multiprocessor there are several `heavy' threads but only one run
- queue. A fancier implementation might have private run queues,
- which would lead to a simpler (trivial) implementation */
-
-typedef struct coop_q_t {
- coop_t t;
- coop_t *tail;
-} coop_q_t;
-
-/* A Mutex variable is made up of a owner thread, and a queue of threads
- waiting on the mutex */
-
-typedef struct coop_m {
- coop_t *owner; /* Mutex owner */
- coop_q_t waiting; /* Queue of waiting threads */
-} coop_m;
-
-/* A Condition variable is made up of a list of threads waiting on the
- condition. */
-
-typedef struct coop_c {
- coop_q_t waiting; /* Queue of waiting threads */
-} coop_c;
-
-/* Each thread starts by calling a user-supplied function of this
- type. */
-
-typedef void (coop_userf_t)(void *p0);
-
-/* Call this before any other primitives. */
-extern void coop_init();
-
-/* When one or more threads are created by the main thread,
- the system goes multithread when this is called. It is done
- (no more runable threads) when this returns. */
-
-extern void coop_start (void);
-
-/* Create a thread and make it runable. When the thread starts
- running it will call `f' with arguments `p0' and `p1'. */
-
-extern coop_t *coop_create (coop_userf_t *f, void *p0);
-
-/* The current thread stops running but stays runable.
- It is an error to call `coop_yield' before `coop_start'
- is called or after `coop_start' returns. */
-
-extern void coop_yield (void);
-
-/* Like `coop_yield' but the thread is discarded. Any intermediate
- state is lost. The thread can also terminate by simply
- returning. */
-
-extern void coop_abort (void);
-
-extern coop_q_t coop_global_allq; /* A queue of all threads. */
-extern coop_t *coop_global_curr; /* Currently-executing thread. */
-
-
-
-extern size_t scm_switch_counter;
-extern size_t scm_thread_count;
-
-
-
-/* Cooperative threads don't need to have these defined */
-
-#define SCM_THREAD_CRITICAL_SECTION_START
-#define SCM_THREAD_CRITICAL_SECTION_END
-#define SCM_THREAD_INITIALIZE_STORAGE gscm_threads_init_coop_threads()
-
-
-
-#define SCM_NO_CRITICAL_SECTION_OWNER 0
-#define SCM_THREAD_SWITCH_COUNT 10
-
-
-
-#define SCM_DEFER_INTS \
-{ \
- scm_ints_disabled = 1; \
-}
-
-#define SCM_ALLOW_INTS \
-{ \
- scm_ints_disabled = 0; \
- SCM_CHECK_INTS; \
- scm_switch_counter--; \
- if (scm_switch_counter == 0) \
- { \
- scm_switch_counter = SCM_THREAD_SWITCH_COUNT; \
- if (scm_thread_count > 1) \
- coop_yield(); \
- } \
-}
-
-#define SCM_REDEFER_INTS \
-{ \
- ++scm_ints_disabled; \
-}
-
-#define SCM_REALLOW_INTS \
-{ \
- --scm_ints_disabled; \
- if (!scm_ints_disabled) \
- { \
- SCM_CHECK_INTS; \
- } \
- scm_switch_counter--; \
- if (scm_switch_counter == 0) \
- { \
- scm_switch_counter = SCM_THREAD_SWITCH_COUNT; \
- if (scm_thread_count > 1) \
- coop_yield(); \
- } \
-}
-
-
-
-/* This structure is used when creating new threads. */
-
-struct scm_coop_create_info_type
-{
- SCM thunk;
- SCM error;
-};
-
-extern struct scm_coop_create_info_type scm_coop_create_info;
-
-#endif
diff --git a/libguile/coop.c b/libguile/coop.c
index 56f7175d2..a03ba08ea 100644
--- a/libguile/coop.c
+++ b/libguile/coop.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,11 +37,10 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
-/* $Id: coop.c,v 1.1 1997-04-15 01:34:30 jimb Exp $ */
+/* $Id: coop.c,v 1.2 1997-05-26 22:31:48 jimb Exp $ */
/* Cooperative thread library, based on QuickThreads */
diff --git a/libguile/debug.c b/libguile/debug.c
index c48de1995..9ffe23d82 100644
--- a/libguile/debug.c
+++ b/libguile/debug.c
@@ -13,7 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
* If you do not wish that, delete this exception notice.
*
* The author can be reached at djurfeldt@nada.kth.se
- * Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN
- */
+ * Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN */
#include <stdio.h>
#include "_scm.h"
diff --git a/libguile/debug.h b/libguile/debug.h
index 4e4aea1d5..39919e26e 100644
--- a/libguile/debug.h
+++ b/libguile/debug.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -43,8 +44,7 @@
* If you do not wish that, delete this exception notice.
*
* The author can be reached at djurfeldt@nada.kth.se
- * Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN
- */
+ * Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN */
#include "libguile/__scm.h"
diff --git a/libguile/dynl-dl.c b/libguile/dynl-dl.c
index f72821bc6..9655b7fa5 100644
--- a/libguile/dynl-dl.c
+++ b/libguile/dynl-dl.c
@@ -14,7 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -38,8 +39,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
/* "dynl.c" dynamically link&load object files.
Author: Aubrey Jaffer
diff --git a/libguile/dynl-dld.c b/libguile/dynl-dld.c
index 64fda4d3f..f9cec2778 100644
--- a/libguile/dynl-dld.c
+++ b/libguile/dynl-dld.c
@@ -14,7 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -38,8 +39,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
/* "dynl.c" dynamically link&load object files.
Author: Aubrey Jaffer
diff --git a/libguile/dynl-shl.c b/libguile/dynl-shl.c
index ae32f07a4..9d0ee613b 100644
--- a/libguile/dynl-shl.c
+++ b/libguile/dynl-shl.c
@@ -14,7 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -38,8 +39,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
/* "dynl.c" dynamically link&load object files.
Author: Aubrey Jaffer
diff --git a/libguile/dynl-vms.c b/libguile/dynl-vms.c
index 322839cbc..a686cee9e 100644
--- a/libguile/dynl-vms.c
+++ b/libguile/dynl-vms.c
@@ -14,7 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -38,8 +39,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
/* "dynl.c" dynamically link&load object files.
Author: Aubrey Jaffer
diff --git a/libguile/dynl.c b/libguile/dynl.c
index 8e2226d0a..b480e2281 100644
--- a/libguile/dynl.c
+++ b/libguile/dynl.c
@@ -14,7 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -38,8 +39,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
/* "dynl.c" dynamically link&load object files.
Author: Aubrey Jaffer
diff --git a/libguile/dynl.h b/libguile/dynl.h
index c61805752..957e5a85e 100644
--- a/libguile/dynl.h
+++ b/libguile/dynl.h
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#ifndef LIBGUILE_DYNL_H
diff --git a/libguile/dynwind.c b/libguile/dynwind.c
index 4a9424b0f..cd32158b1 100644
--- a/libguile/dynwind.c
+++ b/libguile/dynwind.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/dynwind.h b/libguile/dynwind.h
index 7352751c0..abc0c21a8 100644
--- a/libguile/dynwind.h
+++ b/libguile/dynwind.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/eq.c b/libguile/eq.c
index b4046ce1b..7e9d4a45f 100644
--- a/libguile/eq.c
+++ b/libguile/eq.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
#include "_scm.h"
diff --git a/libguile/eq.h b/libguile/eq.h
index c9deb5007..9f8e60e5c 100644
--- a/libguile/eq.h
+++ b/libguile/eq.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/error.c b/libguile/error.c
index 5d8a36247..a11caba22 100644
--- a/libguile/error.c
+++ b/libguile/error.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/error.h b/libguile/error.h
index 7327f27d6..839a30eb7 100644
--- a/libguile/error.h
+++ b/libguile/error.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/eval.c b/libguile/eval.c
index b8c8e1b1f..5111dc28d 100644
--- a/libguile/eval.c
+++ b/libguile/eval.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
/* This file is read twice in order to produce debugging versions of
diff --git a/libguile/eval.h b/libguile/eval.h
index f83eb1560..85ca7c267 100644
--- a/libguile/eval.h
+++ b/libguile/eval.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/extchrs.h b/libguile/extchrs.h
index 3f1f02276..a4c2a0ab4 100644
--- a/libguile/extchrs.h
+++ b/libguile/extchrs.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdlib.h>
diff --git a/libguile/feature.c b/libguile/feature.c
index 9aaee678c..e59ab3399 100644
--- a/libguile/feature.c
+++ b/libguile/feature.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/feature.h b/libguile/feature.h
index 712aff8a0..7b24d06a6 100644
--- a/libguile/feature.h
+++ b/libguile/feature.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/filesys.c b/libguile/filesys.c
index eaec974fc..30234a87f 100644
--- a/libguile/filesys.c
+++ b/libguile/filesys.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
#include "_scm.h"
diff --git a/libguile/filesys.h b/libguile/filesys.h
index aae4db349..e8e3fe773 100644
--- a/libguile/filesys.h
+++ b/libguile/filesys.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/fports.c b/libguile/fports.c
index 49e28c722..7807159fb 100644
--- a/libguile/fports.c
+++ b/libguile/fports.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/fports.h b/libguile/fports.h
index 5f92367ab..b8834462f 100644
--- a/libguile/fports.h
+++ b/libguile/fports.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/fsu-pthreads.h b/libguile/fsu-pthreads.h
index 58122e5a5..49ea144b0 100644
--- a/libguile/fsu-pthreads.h
+++ b/libguile/fsu-pthreads.h
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#ifndef SCM_FSU_PTHREADS_H
diff --git a/libguile/gc.c b/libguile/gc.c
index 84d94b83d..49b2789c5 100644
--- a/libguile/gc.c
+++ b/libguile/gc.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
#include "_scm.h"
diff --git a/libguile/gc.h b/libguile/gc.h
index 0a1f20549..c594bf635 100644
--- a/libguile/gc.h
+++ b/libguile/gc.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/gdbint.c b/libguile/gdbint.c
index 29a35f4d0..64a3e1bd5 100644
--- a/libguile/gdbint.c
+++ b/libguile/gdbint.c
@@ -13,7 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
* If you do not wish that, delete this exception notice.
*
* The author can be reached at djurfeldt@nada.kth.se
- * Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN
- */
+ * Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN */
#include <stdio.h>
#include "_scm.h"
diff --git a/libguile/gdbint.h b/libguile/gdbint.h
index db6b15753..e4e02b997 100644
--- a/libguile/gdbint.h
+++ b/libguile/gdbint.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -43,8 +44,7 @@
* If you do not wish that, delete this exception notice.
*
* The author can be reached at djurfeldt@nada.kth.se
- * Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN
- */
+ * Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN */
#include "libguile/__scm.h"
diff --git a/libguile/genio.c b/libguile/genio.c
index 5ebd86e3f..61a2d9f23 100644
--- a/libguile/genio.c
+++ b/libguile/genio.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "extchrs.h"
#include <stdio.h>
diff --git a/libguile/genio.h b/libguile/genio.h
index 78d17fac5..e475fff7e 100644
--- a/libguile/genio.h
+++ b/libguile/genio.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/gh.h b/libguile/gh.h
index 94d575e52..b32b8a1cc 100644
--- a/libguile/gh.h
+++ b/libguile/gh.h
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#ifndef __GH_H
diff --git a/libguile/gh_data.c b/libguile/gh_data.c
index 6edee837e..6b2e726ae 100644
--- a/libguile/gh_data.c
+++ b/libguile/gh_data.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
/* data initialization and C<->Scheme data conversion */
diff --git a/libguile/gh_eval.c b/libguile/gh_eval.c
index bad70ed13..55d4cdcab 100644
--- a/libguile/gh_eval.c
+++ b/libguile/gh_eval.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
/* routines to evaluate Scheme code */
diff --git a/libguile/gh_funcs.c b/libguile/gh_funcs.c
index 048ab209a..b02997f24 100644
--- a/libguile/gh_funcs.c
+++ b/libguile/gh_funcs.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
diff --git a/libguile/gh_init.c b/libguile/gh_init.c
index 50b59e5ac..86b894e64 100644
--- a/libguile/gh_init.c
+++ b/libguile/gh_init.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
/* Guile high level (gh_) interface, initialization-related stuff */
diff --git a/libguile/gh_io.c b/libguile/gh_io.c
index adbe15798..567294991 100644
--- a/libguile/gh_io.c
+++ b/libguile/gh_io.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/gh_list.c b/libguile/gh_list.c
index d9346e590..6442c57c7 100644
--- a/libguile/gh_list.c
+++ b/libguile/gh_list.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
/* list manipulation */
diff --git a/libguile/gh_predicates.c b/libguile/gh_predicates.c
index 42cf2c065..5edf2bd2d 100644
--- a/libguile/gh_predicates.c
+++ b/libguile/gh_predicates.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
/* type predicates and equality predicates */
diff --git a/libguile/gh_test_c.c b/libguile/gh_test_c.c
index e5215a0cb..b834b0dd2 100644
--- a/libguile/gh_test_c.c
+++ b/libguile/gh_test_c.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/gh_test_repl.c b/libguile/gh_test_repl.c
index 52f70ebc4..d220642c9 100644
--- a/libguile/gh_test_repl.c
+++ b/libguile/gh_test_repl.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
/* gh_test_repl -- a program that demonstrates starting Guile, adding
diff --git a/libguile/gscm.c b/libguile/gscm.c
index daf172730..83fee04fd 100644
--- a/libguile/gscm.c
+++ b/libguile/gscm.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
diff --git a/libguile/gscm.h b/libguile/gscm.h
index 7e0554e5e..e69de29bb 100644
--- a/libguile/gscm.h
+++ b/libguile/gscm.h
@@ -1,281 +0,0 @@
-/* classes: h_files */
-
-#ifndef GSCMH
-#define GSCMH
-
-/* Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * As a special exception, the Free Software Foundation gives permission
- * for additional uses of the text contained in its release of GUILE.
- *
- * The exception is that, if you link the GUILE library with other files
- * to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE. If you copy
- * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
- * not apply to the code that you add in this way. To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
- *
- * If you write modifications of your own for GUILE, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
-
-
-#include "libguile.h"
-
-
-/* {Locking Out Async Execution (including async GC) and Non-Local Exits}
- */
-
-#define GSCM_DEFER_INTS SCM_DEFER_INTS
-#define GSCM_ALLOW_INTS SCM_ALLOW_INTS
-
-
-/* {Common Constants}
- */
-
-#define GSCM_EOL SCM_EOL
-#define GSCM_FALSE SCM_BOOL_F
-#define GSCM_TRUE SCM_BOOL_T
-
-#define GSCM_EOL_MARKER SCM_UNDEFINED
-#define GSCM_NOT_PASSED SCM_UNDEFINED
-#define GSCM_UNSPECIFIED SCM_UNSPECIFIED
-
-
-/* {Booleans}
- */
-
-#define gscm_bool(CBOOL) ((CBOOL) ? SCM_BOOL_T : SCM_BOOL_F)
-#define gscm_2_bool(BOOL) (((BOOL) == SCM_BOOL_F) ? 0 : 1)
-
-
-/* {Numbers}
- */
-
-#define gscm_ulong scm_ulong2num
-#define gscm_long scm_long2num
-#define gscm_double(X) scm_makdbl ((X), 0.0)
-
-#define gscm_2_ulong(OBJ) scm_num2ulong((OBJ), (char *)SCM_ARG1, "gscm_2_ulong")
-#define gscm_2_long(OBJ) scm_num2long((OBJ), (char *)SCM_ARG1, "gscm_2_long")
-#define gscm_2_double(OBJ) scm_num2dbl((OBJ), "gscm_2_double")
-
-
-/* {Characters}
- */
-
-#define gscm_char(C) SCM_MAKICHR(C)
-/* extern int gscm_2_char P((SCM)); */
-
-
-/* {Strings}
- */
-
-#define gscm_str(SRC, LEN) scm_makfromstr (SRC, LEN, 0)
-#define gscm_str0 scm_makfrom0str
-
-
-
-/* {Pairs and Lists}
- */
-
-#define gscm_cons scm_cons
-#define gscm_list scm_listify
-#define gscm_ilength scm_ilength
-
-
-#define gscm_set_car(OBJ, VAL) \
- ((SCM_NIMP(OBJ) && SCM_CONSP(OBJ)) \
- ? (SCM_CAR(OBJ) = VAL) \
- : scm_wta ((OBJ), (char *)SCM_ARG1, "set-car!"))
-
-#define gscm_set_cdr(OBJ, VAL) \
- ((SCM_NIMP(OBJ) && SCM_CONSP(OBJ)) \
- ? (SCM_CDR(OBJ) = VAL) \
- : scm_wta ((OBJ), (char *)SCM_ARG1, "set-cdr!"))
-
-
-#define GSCM_SAFE_CAR(X) ((SCM_NIMP(X) && SCM_CONSP(X)) \
- ? SCM_CAR(X) \
- : scm_wta ((X), (char *)SCM_ARG1, "car"))
-
-#define GSCM_SAFE_CDR(X) ((SCM_NIMP(X) && SCM_CONSP(X)) \
- ? SCM_CDR(X) \
- : scm_wta ((X), (char *)SCM_ARG1, "cdr"))
-
-#define gscm_car(OBJ) GSCM_SAFE_CAR (OBJ)
-#define gscm_cdr(OBJ) GSCM_SAFE_CDR (OBJ)
-
-#define gscm_caar(OBJ) GSCM_SAFE_CAR (GSCM_SAFE_CAR (OBJ))
-#define gscm_cdar(OBJ) GSCM_SAFE_CDR (GSCM_SAFE_CAR (OBJ))
-#define gscm_cadr(OBJ) GSCM_SAFE_CAR (GSCM_SAFE_CDR (OBJ))
-#define gscm_cddr(OBJ) GSCM_SAFE_CDR (GSCM_SAFE_CDR (OBJ))
-
-#define gscm_caaar(OBJ) GSCM_SAFE_CAR (GSCM_SAFE_CAR (GSCM_SAFE_CAR (OBJ)))
-#define gscm_cdaar(OBJ) GSCM_SAFE_CDR (GSCM_SAFE_CAR (GSCM_SAFE_CAR (OBJ)))
-#define gscm_cadar(OBJ) GSCM_SAFE_CAR (GSCM_SAFE_CDR (GSCM_SAFE_CAR (OBJ)))
-#define gscm_cddar(OBJ) GSCM_SAFE_CDR (GSCM_SAFE_CDR (GSCM_SAFE_CAR (OBJ)))
-#define gscm_caadr(OBJ) GSCM_SAFE_CAR (GSCM_SAFE_CAR (GSCM_SAFE_CDR (OBJ)))
-#define gscm_cdadr(OBJ) GSCM_SAFE_CDR (GSCM_SAFE_CAR (GSCM_SAFE_CDR (OBJ)))
-#define gscm_caddr(OBJ) GSCM_SAFE_CAR (GSCM_SAFE_CDR (GSCM_SAFE_CDR (OBJ)))
-#define gscm_cdddr(OBJ) GSCM_SAFE_CDR (GSCM_SAFE_CDR (GSCM_SAFE_CDR (OBJ)))
-
-#define gscm_caaaar(OBJ) GSCM_SAFE_CAR (GSCM_SAFE_CAR (GSCM_SAFE_CAR (GSCM_SAFE_CAR (OBJ))))
-#define gscm_cdaaar(OBJ) GSCM_SAFE_CDR (GSCM_SAFE_CAR (GSCM_SAFE_CAR (GSCM_SAFE_CAR (OBJ))))
-#define gscm_cadaar(OBJ) GSCM_SAFE_CAR (GSCM_SAFE_CDR (GSCM_SAFE_CAR (GSCM_SAFE_CAR (OBJ))))
-#define gscm_cddaar(OBJ) GSCM_SAFE_CDR (GSCM_SAFE_CDR (GSCM_SAFE_CAR (GSCM_SAFE_CAR (OBJ))))
-#define gscm_caadar(OBJ) GSCM_SAFE_CAR (GSCM_SAFE_CAR (GSCM_SAFE_CDR (GSCM_SAFE_CAR (OBJ))))
-#define gscm_cdadar(OBJ) GSCM_SAFE_CDR (GSCM_SAFE_CAR (GSCM_SAFE_CDR (GSCM_SAFE_CAR (OBJ))))
-#define gscm_caddar(OBJ) GSCM_SAFE_CAR (GSCM_SAFE_CDR (GSCM_SAFE_CDR (GSCM_SAFE_CAR (OBJ))))
-#define gscm_cdddar(OBJ) GSCM_SAFE_CDR (GSCM_SAFE_CDR (GSCM_SAFE_CDR (GSCM_SAFE_CAR (OBJ))))
-#define gscm_caaadr(OBJ) GSCM_SAFE_CAR (GSCM_SAFE_CAR (GSCM_SAFE_CAR (GSCM_SAFE_CDR (OBJ))))
-#define gscm_cdaadr(OBJ) GSCM_SAFE_CDR (GSCM_SAFE_CAR (GSCM_SAFE_CAR (GSCM_SAFE_CDR (OBJ))))
-#define gscm_cadadr(OBJ) GSCM_SAFE_CAR (GSCM_SAFE_CDR (GSCM_SAFE_CAR (GSCM_SAFE_CDR (OBJ))))
-#define gscm_cddadr(OBJ) GSCM_SAFE_CDR (GSCM_SAFE_CDR (GSCM_SAFE_CAR (GSCM_SAFE_CDR (OBJ))))
-#define gscm_caaddr(OBJ) GSCM_SAFE_CAR (GSCM_SAFE_CAR (GSCM_SAFE_CDR (GSCM_SAFE_CDR (OBJ))))
-#define gscm_cdaddr(OBJ) GSCM_SAFE_CDR (GSCM_SAFE_CAR (GSCM_SAFE_CDR (GSCM_SAFE_CDR (OBJ))))
-#define gscm_cadddr(OBJ) GSCM_SAFE_CAR (GSCM_SAFE_CDR (GSCM_SAFE_CDR (GSCM_SAFE_CDR (OBJ))))
-#define gscm_cddddr(OBJ) GSCM_SAFE_CDR (GSCM_SAFE_CDR (GSCM_SAFE_CDR (GSCM_SAFE_CDR (OBJ))))
-
-
-/* {Symbols}
- */
-
-#define gscm_symbol(STR, LEN) SCM_CAR(scm_intern (STR, LEN))
-#define gscm_tmp_symbol(STR, LEN) SCM_CAR(scm_intern_obarray (STR, LEN, SCM_BOOL_F))
-
-
-/* {Vectors}
- */
-
-#define gscm_vector(N, FILL) scm_make_vector (SCM_MAKINUM(N), (FILL), SCM_UNDEFINED)
-#define gscm_vref(V, I) scm_vector_ref ((V), SCM_MAKINUM(I))
-#define gscm_vset(V, I, VAL) scm_vector_set_x ((V), SCM_MAKINUM(I), (VAL))
-
-
-/* {Procedures}
- */
-
-/* extern SCM gscm_make_subr P((SCM (*fn)(), int req, int opt, int varp, char * doc)); */
-/* extern SCM gscm_curry P((SCM procedure, SCM first_arg)); */
-
-#define gscm_apply(PROC, ARGS) scm_apply ((PROC), (ARGS), SCM_EOL)
-
-
-
-/* {Non-local Exits}
- */
-
-
-#define gscm_catch(T, TH, H) scm_catch ((T), (TH), (H))
-#define gscm_throw(T, V) scm_throw ((T), (V))
-#define gscm_dynamic_wind(E, T, L) scm_dynwind ((E), (T), (L))
-/* extern void gscm_error P((char * message, SCM args)); */
-
-
-/* {I/O}
- */
-
-#define gscm_print_obj scm_prin1
-#define gscm_putc scm_putc
-#define gscm_puts scm_puts
-#define gscm_fwrite scm_fwrite
-#define gscm_flush scm_flush
-
-extern char * gscm_last_attempted_init_file;
-
-/* {Equivalence}
- */
-
-
-#define gscm_is_eq(OBJ) (SCM_BOOL_F != scm_eq (OBJ))
-#define gscm_is_eqv(OBJ) (SCM_BOOL_F != scm_eqv (OBJ))
-#define gscm_is_equal(OBJ) (SCM_BOOL_F != scm_equal_p (OBJ))
-
-
-/* {Procedure Properties}
- */
-
-#define gscm_procedure_properties scm_procedure_properties
-#define gscm_set_procedure_properties_x scm_set_procedure_properties_x
-#define gscm_procedure_property scm_procedure_property
-#define gscm_set_procedure_property_x scm_set_procedure_property_x
-
-
-/* {Generic Length Procedure}
- */
-
-#define gscm_obj_length scm_obj_length
-
-
-/* {Proc Declaration Macro}
- */
-#ifndef GSCM_MAGIC_SNARFER
-#define GSCM_PROC(RANAME, CFN, STR, REQ, OPT, VAR) \
- static char RANAME[]=STR;
-#else
-#define GSCM_PROC(RANAME, CFN, STR, REQ, OPT, VAR) \
-%%% gscm_define_procedure (RANAME, CFN, REQ, OPT, VAR, "")
-#endif
-
-#define gscm_define_procedure(NAME, FN, REQ, OPT, VARP, DOC) scm_make_gsubr(name, req, opt, varp, fn)
-#define gscm_curry scm_curry
-#define gscm_define scm_sysintern
-
-
-typedef int GSCM_top_level;
-
-
-/* {Error Returns}
- */
-
-typedef int GSCM_status;
-
-#define GSCM_OK 0
-#define GSCM_ERROR 1
-#define GSCM_ILLEGALLY_REENTERED 2
-#define GSCM_OUT_OF_MEM 3
-#define GSCM_ERROR_OPENING_FILE 4
-#define GSCM_ERROR_OPENING_INIT_FILE 5
-
-
-
-extern GSCM_status gscm_seval_str SCM_P ((SCM *answer, GSCM_top_level toplvl, char * str));
-extern GSCM_status gscm_seval_file SCM_P ((SCM *answer, GSCM_top_level toplvl, char * file_name));
-extern GSCM_status gscm_eval_str SCM_P ((char ** answer, GSCM_top_level toplvl, char * str));
-extern GSCM_status gscm_eval_file SCM_P ((char ** answer, GSCM_top_level toplvl, char * file_name));
-extern GSCM_status gscm_run_scm SCM_P ((int argc, char ** argv, FILE * in, FILE * out, FILE * err, GSCM_status (*initfn)(void), char * initfile, char * initcmd));
-extern char * gscm_error_msg SCM_P ((int n));
-extern SCM gscm_make_subr SCM_P ((SCM (*fn)(), int req, int opt, int varp, char * doc));
-extern int gscm_2_char SCM_P ((SCM c));
-extern void gscm_2_str SCM_P ((char ** out, int * len_out, SCM * objp));
-extern void gscm_error SCM_P ((char * message, SCM args));
-extern void scm_init_guile SCM_P ((void));
-
-#endif /* GSCMH */
-
diff --git a/libguile/gsubr.c b/libguile/gsubr.c
index b69a6c497..f755f8fe7 100644
--- a/libguile/gsubr.c
+++ b/libguile/gsubr.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/gsubr.h b/libguile/gsubr.h
index 7eb34ce02..28298c915 100644
--- a/libguile/gsubr.h
+++ b/libguile/gsubr.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/guile.c b/libguile/guile.c
index a93f16104..b41318ce2 100644
--- a/libguile/guile.c
+++ b/libguile/guile.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
/* This is the 'main' function for the `guile' executable. It is not
included in libguile.a.
diff --git a/libguile/hash.c b/libguile/hash.c
index 3ea9f866a..2bcd14d16 100644
--- a/libguile/hash.c
+++ b/libguile/hash.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/hash.h b/libguile/hash.h
index b9637d0c0..884459d57 100644
--- a/libguile/hash.h
+++ b/libguile/hash.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/hashtab.c b/libguile/hashtab.c
index a3cd76499..a40fb00ba 100644
--- a/libguile/hashtab.c
+++ b/libguile/hashtab.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/hashtab.h b/libguile/hashtab.h
index f53d25663..345644c94 100644
--- a/libguile/hashtab.h
+++ b/libguile/hashtab.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/init.c b/libguile/init.c
index 0c38962bb..0133cf2b5 100644
--- a/libguile/init.c
+++ b/libguile/init.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/init.h b/libguile/init.h
index 97fb5e182..8e1fd4716 100644
--- a/libguile/init.h
+++ b/libguile/init.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/ioext.c b/libguile/ioext.c
index a18654097..ecc9aa512 100644
--- a/libguile/ioext.c
+++ b/libguile/ioext.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
diff --git a/libguile/ioext.h b/libguile/ioext.h
index b7d5ae597..d3d2a37a7 100644
--- a/libguile/ioext.h
+++ b/libguile/ioext.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/kw.c b/libguile/kw.c
index 76ca88050..73ee17fe6 100644
--- a/libguile/kw.c
+++ b/libguile/kw.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/kw.h b/libguile/kw.h
index 89387c5b3..e69de29bb 100644
--- a/libguile/kw.h
+++ b/libguile/kw.h
@@ -1,63 +0,0 @@
-/* classes: h_files */
-
-#ifndef KWH
-#define KWH
-/* Copyright (C) 1995,1996 Free Software Foundation, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * As a special exception, the Free Software Foundation gives permission
- * for additional uses of the text contained in its release of GUILE.
- *
- * The exception is that, if you link the GUILE library with other files
- * to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE. If you copy
- * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
- * not apply to the code that you add in this way. To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
- *
- * If you write modifications of your own for GUILE, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
-
-
-#include "libguile/__scm.h"
-
-
-
-extern int scm_tc16_kw;
-#define SCM_KEYWORDP(X) (SCM_CAR(X) == scm_tc16_kw)
-#define SCM_KEYWORDSYM(X) (SCM_CDR(X))
-
-
-
-
-extern SCM scm_make_keyword_from_dash_symbol SCM_P ((SCM symbol));
-extern SCM scm_keyword_p SCM_P ((SCM obj));
-extern SCM scm_keyword_dash_symbol SCM_P ((SCM kw));
-extern void scm_init_kw SCM_P ((void));
-
-#endif /* KWH */
diff --git a/libguile/libguile.h b/libguile/libguile.h
index b3db2ec51..a310c1645 100644
--- a/libguile/libguile.h
+++ b/libguile/libguile.h
@@ -15,7 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -39,8 +40,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
diff --git a/libguile/list.c b/libguile/list.c
index f0040ec58..eb56c53a5 100644
--- a/libguile/list.c
+++ b/libguile/list.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
#include "_scm.h"
diff --git a/libguile/list.h b/libguile/list.h
index 277128375..f6dbf187a 100644
--- a/libguile/list.h
+++ b/libguile/list.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/load.c b/libguile/load.c
index 04ee995ed..36850e0a8 100644
--- a/libguile/load.c
+++ b/libguile/load.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/load.h b/libguile/load.h
index 93db7fdbb..0c575c25a 100644
--- a/libguile/load.h
+++ b/libguile/load.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/mallocs.c b/libguile/mallocs.c
index 4201adca8..e086f228d 100644
--- a/libguile/mallocs.c
+++ b/libguile/mallocs.c
@@ -14,8 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- */
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA */
diff --git a/libguile/mallocs.h b/libguile/mallocs.h
index 19fa8e5cd..4bc347ead 100644
--- a/libguile/mallocs.h
+++ b/libguile/mallocs.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/markers.c b/libguile/markers.c
index 2736b0df5..0b1aa57e3 100644
--- a/libguile/markers.c
+++ b/libguile/markers.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/markers.h b/libguile/markers.h
index 6a80e61a2..e69de29bb 100644
--- a/libguile/markers.h
+++ b/libguile/markers.h
@@ -1,59 +0,0 @@
-/* classes: h_files */
-
-#ifndef MARKERSH
-#define MARKERSH
-/* Copyright (C) 1995,1996 Free Software Foundation, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * As a special exception, the Free Software Foundation gives permission
- * for additional uses of the text contained in its release of GUILE.
- *
- * The exception is that, if you link the GUILE library with other files
- * to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE. If you copy
- * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
- * not apply to the code that you add in this way. To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
- *
- * If you write modifications of your own for GUILE, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
-
-
-#include "libguile/__scm.h"
-
-
-
-
-
-
-
-extern SCM scm_mark0 SCM_P ((SCM ptr));
-extern SCM scm_markcdr SCM_P ((SCM ptr));
-extern scm_sizet scm_free0 SCM_P ((SCM ptr));
-
-#endif /* MARKERSH */
diff --git a/libguile/mbstrings.c b/libguile/mbstrings.c
index 41e04bf80..4a4979dcd 100644
--- a/libguile/mbstrings.c
+++ b/libguile/mbstrings.c
@@ -14,7 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -38,8 +39,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
diff --git a/libguile/mbstrings.h b/libguile/mbstrings.h
index 84482c5a8..611a64ba0 100644
--- a/libguile/mbstrings.h
+++ b/libguile/mbstrings.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/mit-pthreads.c b/libguile/mit-pthreads.c
index d58912c39..a00aa54f1 100644
--- a/libguile/mit-pthreads.c
+++ b/libguile/mit-pthreads.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
typedef struct scm_pthread_info {
diff --git a/libguile/mit-pthreads.h b/libguile/mit-pthreads.h
index ea93c63d1..316eff217 100644
--- a/libguile/mit-pthreads.h
+++ b/libguile/mit-pthreads.h
@@ -17,7 +17,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -41,8 +42,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/net_db.c b/libguile/net_db.c
index 0f0dc23f5..198b95f4a 100644
--- a/libguile/net_db.c
+++ b/libguile/net_db.c
@@ -13,7 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -37,8 +38,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
/* Written in 1994 by Aubrey Jaffer.
* Thanks to Hallvard.Tretteberg@si.sintef.no for inspiration and discussion.
diff --git a/libguile/net_db.h b/libguile/net_db.h
index 76afcca25..b84d7200b 100644
--- a/libguile/net_db.h
+++ b/libguile/net_db.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/numbers.c b/libguile/numbers.c
index 474fc4afd..2d877523e 100644
--- a/libguile/numbers.c
+++ b/libguile/numbers.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/numbers.h b/libguile/numbers.h
index d34e09d9c..26aee98c7 100644
--- a/libguile/numbers.h
+++ b/libguile/numbers.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/objprop.c b/libguile/objprop.c
index 22bbf7fe1..00d46ea1c 100644
--- a/libguile/objprop.c
+++ b/libguile/objprop.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/objprop.h b/libguile/objprop.h
index 89a662346..75424b1d6 100644
--- a/libguile/objprop.h
+++ b/libguile/objprop.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/options.c b/libguile/options.c
index 4161b09bf..a416adf8c 100644
--- a/libguile/options.c
+++ b/libguile/options.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -39,8 +40,7 @@
* If you do not wish that, delete this exception notice.
*
* The author can be reached at djurfeldt@nada.kth.se
- * Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN
- */
+ * Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN */
#include <stdio.h>
diff --git a/libguile/options.h b/libguile/options.h
index 2a7ead55b..499bfddbe 100644
--- a/libguile/options.h
+++ b/libguile/options.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -43,8 +44,7 @@
* If you do not wish that, delete this exception notice.
*
* The author can be reached at djurfeldt@nada.kth.se
- * Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN
- */
+ * Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN */
#include "libguile/__scm.h"
diff --git a/libguile/pairs.c b/libguile/pairs.c
index 619529e64..ab415f2a3 100644
--- a/libguile/pairs.c
+++ b/libguile/pairs.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
#include "_scm.h"
diff --git a/libguile/pairs.h b/libguile/pairs.h
index ec074f77b..e3e6355ef 100644
--- a/libguile/pairs.h
+++ b/libguile/pairs.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/ports.c b/libguile/ports.c
index fbfdaffce..645bd8768 100644
--- a/libguile/ports.c
+++ b/libguile/ports.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
#include "_scm.h"
diff --git a/libguile/ports.h b/libguile/ports.h
index f89c92be6..1a4b23166 100644
--- a/libguile/ports.h
+++ b/libguile/ports.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/posix.c b/libguile/posix.c
index 1379ef752..67aeb87df 100644
--- a/libguile/posix.c
+++ b/libguile/posix.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/posix.h b/libguile/posix.h
index 700591cd6..72d1adb65 100644
--- a/libguile/posix.h
+++ b/libguile/posix.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/print.c b/libguile/print.c
index 01f713747..8aed00228 100644
--- a/libguile/print.c
+++ b/libguile/print.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/print.h b/libguile/print.h
index d16d4f64d..5824d8a39 100644
--- a/libguile/print.h
+++ b/libguile/print.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/procprop.c b/libguile/procprop.c
index 686a26052..d436f7f31 100644
--- a/libguile/procprop.c
+++ b/libguile/procprop.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/procprop.h b/libguile/procprop.h
index cac97edd1..d4d38ac54 100644
--- a/libguile/procprop.h
+++ b/libguile/procprop.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/procs.c b/libguile/procs.c
index c0fd561f0..a7e09fe29 100644
--- a/libguile/procs.c
+++ b/libguile/procs.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/procs.h b/libguile/procs.h
index 50345e784..9e433c43c 100644
--- a/libguile/procs.h
+++ b/libguile/procs.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/putenv.c b/libguile/putenv.c
index 2700fe721..2c7e105ca 100644
--- a/libguile/putenv.c
+++ b/libguile/putenv.c
@@ -12,7 +12,8 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ USA */
#ifdef HAVE_CONFIG_H
#include "libguile/scmconfig.h"
diff --git a/libguile/ramap.c b/libguile/ramap.c
index ec903ece4..591bb7b4e 100644
--- a/libguile/ramap.c
+++ b/libguile/ramap.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
diff --git a/libguile/ramap.h b/libguile/ramap.h
index da4ec2691..f43587f62 100644
--- a/libguile/ramap.h
+++ b/libguile/ramap.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/read.c b/libguile/read.c
index e4fcc5b28..c5eac9edf 100644
--- a/libguile/read.c
+++ b/libguile/read.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "extchrs.h"
diff --git a/libguile/read.h b/libguile/read.h
index f30e6660f..3dcec2b9f 100644
--- a/libguile/read.h
+++ b/libguile/read.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/root.c b/libguile/root.c
index f90750802..82fb099b4 100644
--- a/libguile/root.c
+++ b/libguile/root.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/root.h b/libguile/root.h
index 2602467ee..83d1e0032 100644
--- a/libguile/root.h
+++ b/libguile/root.h
@@ -17,7 +17,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -41,8 +42,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
diff --git a/libguile/scmhob.h b/libguile/scmhob.h
index 06760c970..7912280ef 100644
--- a/libguile/scmhob.h
+++ b/libguile/scmhob.h
@@ -13,8 +13,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+USA */
#include <libguile.h>
diff --git a/libguile/scmsigs.c b/libguile/scmsigs.c
index 7429a1598..9206addef 100644
--- a/libguile/scmsigs.c
+++ b/libguile/scmsigs.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/scmsigs.h b/libguile/scmsigs.h
index 3b8bdc48c..26a0aaa3b 100644
--- a/libguile/scmsigs.h
+++ b/libguile/scmsigs.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/script.c b/libguile/script.c
index ed9d40ac9..3e8158681 100644
--- a/libguile/script.c
+++ b/libguile/script.c
@@ -11,7 +11,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -35,8 +36,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
/* "script.c" argv tricks for `#!' scripts.
Authors: Aubrey Jaffer and Jim Blandy */
diff --git a/libguile/script.h b/libguile/script.h
index 4f526385a..e37485f39 100644
--- a/libguile/script.h
+++ b/libguile/script.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/sequences.c b/libguile/sequences.c
index 38c59e082..e69de29bb 100644
--- a/libguile/sequences.c
+++ b/libguile/sequences.c
@@ -1,113 +0,0 @@
-/* Copyright (C) 1995,1996 Free Software Foundation, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * As a special exception, the Free Software Foundation gives permission
- * for additional uses of the text contained in its release of GUILE.
- *
- * The exception is that, if you link the GUILE library with other files
- * to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE. If you copy
- * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
- * not apply to the code that you add in this way. To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
- *
- * If you write modifications of your own for GUILE, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
-
-
-#include <stdio.h>
-#include "_scm.h"
-
-#include "sequences.h"
-
-
-
-
-
-int
-scm_obj_length (obj)
- SCM obj;
-{
- int i;
- i = scm_ilength(obj);
- if (i >= 0)
- return i;
- else if (SCM_NIMP (obj))
- {
- if (SCM_ROSTRINGP (obj))
- return SCM_ROLENGTH (obj);
- else if (SCM_VECTORP (obj))
- return SCM_LENGTH (obj);
- else
- return -1;
- }
- else
- return -1;
-}
-
-
-SCM_PROC(s_length, "length", 1, 0, 0, scm_length);
-
-SCM
-scm_length(x)
- SCM x;
-{
- int i;
- i = scm_obj_length(x);
- if (i >= 0)
- return SCM_MAKINUM (i);
- else
- {
- SCM_ASSERT(0, x, SCM_ARG1, s_length);
- return SCM_BOOL_F;
- }
-}
-
-
-
-
-
-SCM_PROC (s_reverse, "reverse", 1, 0, 0, scm_reverse);
-
-SCM
-scm_reverse (objs)
- SCM objs;
-{
- return scm_list_reverse (objs);
-}
-
-
-
-
-
-void
-scm_init_sequences ()
-{
-#include "sequences.x"
-}
-
diff --git a/libguile/sequences.h b/libguile/sequences.h
index 6520457fc..e69de29bb 100644
--- a/libguile/sequences.h
+++ b/libguile/sequences.h
@@ -1,59 +0,0 @@
-/* classes: h_files */
-
-#ifndef SEQUENCESH
-#define SEQUENCESH
-/* Copyright (C) 1995,1996 Free Software Foundation, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * As a special exception, the Free Software Foundation gives permission
- * for additional uses of the text contained in its release of GUILE.
- *
- * The exception is that, if you link the GUILE library with other files
- * to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE. If you copy
- * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
- * not apply to the code that you add in this way. To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
- *
- * If you write modifications of your own for GUILE, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
-
-#include "libguile/__scm.h"
-
-
-
-
-
-
-
-extern int scm_obj_length SCM_P ((SCM obj));
-extern SCM scm_length SCM_P ((SCM x));
-extern SCM scm_reverse SCM_P ((SCM objs));
-extern void scm_init_sequences SCM_P ((void));
-
-#endif /* SEQUENCESH */
diff --git a/libguile/simpos.c b/libguile/simpos.c
index 8bbbaadd9..6d67e422d 100644
--- a/libguile/simpos.c
+++ b/libguile/simpos.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/simpos.h b/libguile/simpos.h
index 023966ad1..dff883189 100644
--- a/libguile/simpos.h
+++ b/libguile/simpos.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/smob.c b/libguile/smob.c
index 90c27f6fe..25c8669de 100644
--- a/libguile/smob.c
+++ b/libguile/smob.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/smob.h b/libguile/smob.h
index b009920ce..625b7975a 100644
--- a/libguile/smob.h
+++ b/libguile/smob.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/snarf.h b/libguile/snarf.h
index 7780bcb35..2b7c75dfd 100644
--- a/libguile/snarf.h
+++ b/libguile/snarf.h
@@ -19,7 +19,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
diff --git a/libguile/socket.c b/libguile/socket.c
index a60627682..64eb02d42 100644
--- a/libguile/socket.c
+++ b/libguile/socket.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/socket.h b/libguile/socket.h
index 1d28b8171..70bcaebf4 100644
--- a/libguile/socket.h
+++ b/libguile/socket.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/srcprop.c b/libguile/srcprop.c
index 364d8abbb..d52cb3a24 100644
--- a/libguile/srcprop.c
+++ b/libguile/srcprop.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -39,8 +40,7 @@
* If you do not wish that, delete this exception notice.
*
* The author can be reached at djurfeldt@nada.kth.se
- * Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN
- */
+ * Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN */
#include <stdio.h>
diff --git a/libguile/srcprop.h b/libguile/srcprop.h
index af2371603..ed4873f1e 100644
--- a/libguile/srcprop.h
+++ b/libguile/srcprop.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -43,8 +44,7 @@
* If you do not wish that, delete this exception notice.
*
* The author can be reached at djurfeldt@nada.kth.se
- * Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN
- */
+ * Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN */
#include "libguile/__scm.h"
diff --git a/libguile/stackchk.c b/libguile/stackchk.c
index 92846170f..4645db4be 100644
--- a/libguile/stackchk.c
+++ b/libguile/stackchk.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/stackchk.h b/libguile/stackchk.h
index 6e6a358fc..984a8c018 100644
--- a/libguile/stackchk.h
+++ b/libguile/stackchk.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/stacks.c b/libguile/stacks.c
index d26326b96..6be4ffca1 100644
--- a/libguile/stacks.c
+++ b/libguile/stacks.c
@@ -13,7 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
* If you do not wish that, delete this exception notice.
*
* The author can be reached at djurfeldt@nada.kth.se
- * Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN
- */
+ * Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN */
#include <stdio.h>
diff --git a/libguile/stacks.h b/libguile/stacks.h
index c16bacc69..9e55f0abc 100644
--- a/libguile/stacks.h
+++ b/libguile/stacks.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -43,8 +44,7 @@
* If you do not wish that, delete this exception notice.
*
* The author can be reached at djurfeldt@nada.kth.se
- * Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN
- */
+ * Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN */
#include "libguile/__scm.h"
diff --git a/libguile/stime.c b/libguile/stime.c
index 897b08ac8..37042f8a5 100644
--- a/libguile/stime.c
+++ b/libguile/stime.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/stime.h b/libguile/stime.h
index d25f8378b..9d5ea0d4e 100644
--- a/libguile/stime.h
+++ b/libguile/stime.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/strings.c b/libguile/strings.c
index e3c24406b..35ae04279 100644
--- a/libguile/strings.c
+++ b/libguile/strings.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/strings.h b/libguile/strings.h
index 93f5a6e43..5243255da 100644
--- a/libguile/strings.h
+++ b/libguile/strings.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/strop.c b/libguile/strop.c
index 4adfed975..482bf89d1 100644
--- a/libguile/strop.c
+++ b/libguile/strop.c
@@ -13,8 +13,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with this software; see the file COPYING. If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+along with this software; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA */
diff --git a/libguile/strop.h b/libguile/strop.h
index a91812df2..d09d81c56 100644
--- a/libguile/strop.h
+++ b/libguile/strop.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/strorder.c b/libguile/strorder.c
index a4fe03daa..cb618e17a 100644
--- a/libguile/strorder.c
+++ b/libguile/strorder.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/strorder.h b/libguile/strorder.h
index 2263a1c7f..71b94e9ab 100644
--- a/libguile/strorder.h
+++ b/libguile/strorder.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/strports.c b/libguile/strports.c
index 55ae2ed1e..d4a5720c2 100644
--- a/libguile/strports.c
+++ b/libguile/strports.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/strports.h b/libguile/strports.h
index ecba678e4..9bccfe161 100644
--- a/libguile/strports.h
+++ b/libguile/strports.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/struct.c b/libguile/struct.c
index 51f934e07..525df2638 100644
--- a/libguile/struct.c
+++ b/libguile/struct.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/struct.h b/libguile/struct.h
index e076a8aee..545a41c9f 100644
--- a/libguile/struct.h
+++ b/libguile/struct.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/symbols.c b/libguile/symbols.c
index da00cd267..47cd345a0 100644
--- a/libguile/symbols.c
+++ b/libguile/symbols.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/symbols.h b/libguile/symbols.h
index ced3dda10..e646c97fd 100644
--- a/libguile/symbols.h
+++ b/libguile/symbols.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/tag.c b/libguile/tag.c
index 09f0effe5..d85fff5e7 100644
--- a/libguile/tag.c
+++ b/libguile/tag.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
#include "_scm.h"
diff --git a/libguile/tag.h b/libguile/tag.h
index 9c4952bdf..9beaef8dd 100644
--- a/libguile/tag.h
+++ b/libguile/tag.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/tags.h b/libguile/tags.h
index 72610f7e0..4f428500e 100644
--- a/libguile/tags.h
+++ b/libguile/tags.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
/** This file defines the format of SCM values and cons pairs.
diff --git a/libguile/threads.c b/libguile/threads.c
index f1c826f2a..b540f51b1 100644
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/threads.h b/libguile/threads.h
index cebd28827..0c23293b2 100644
--- a/libguile/threads.h
+++ b/libguile/threads.h
@@ -17,7 +17,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -41,8 +42,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/throw.c b/libguile/throw.c
index 88536046d..dbb98a46e 100644
--- a/libguile/throw.c
+++ b/libguile/throw.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/throw.h b/libguile/throw.h
index 99d8ff692..81f5fd6d9 100644
--- a/libguile/throw.h
+++ b/libguile/throw.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/unif.c b/libguile/unif.c
index fc9879a89..8fbe4b7a8 100644
--- a/libguile/unif.c
+++ b/libguile/unif.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/unif.h b/libguile/unif.h
index a63da0cee..5da9ac27b 100644
--- a/libguile/unif.h
+++ b/libguile/unif.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/variable.c b/libguile/variable.c
index f87887f1f..5d64bab4a 100644
--- a/libguile/variable.c
+++ b/libguile/variable.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/variable.h b/libguile/variable.h
index 9bced2936..b63922b2e 100644
--- a/libguile/variable.h
+++ b/libguile/variable.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/vectors.c b/libguile/vectors.c
index 4484bf841..08c13b557 100644
--- a/libguile/vectors.c
+++ b/libguile/vectors.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/vectors.h b/libguile/vectors.h
index 5b98afbcc..754cebdf7 100644
--- a/libguile/vectors.h
+++ b/libguile/vectors.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/version.c b/libguile/version.c
index 889b08efc..25e3d0d39 100644
--- a/libguile/version.c
+++ b/libguile/version.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "_scm.h"
diff --git a/libguile/version.h b/libguile/version.h
index ff48cf231..41d18a49b 100644
--- a/libguile/version.h
+++ b/libguile/version.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/vports.c b/libguile/vports.c
index b737455af..26f572b56 100644
--- a/libguile/vports.c
+++ b/libguile/vports.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
diff --git a/libguile/vports.h b/libguile/vports.h
index 27b14a3d6..4d9517a73 100644
--- a/libguile/vports.h
+++ b/libguile/vports.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"
diff --git a/libguile/weaks.c b/libguile/weaks.c
index cb2912970..5a79c8591 100644
--- a/libguile/weaks.c
+++ b/libguile/weaks.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, Free Software Foundation gives permission
* for additional uses of the text contained in its release of this library.
@@ -36,8 +37,7 @@
*
* If you write modifications of your own for this library, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include <stdio.h>
#include "_scm.h"
diff --git a/libguile/weaks.h b/libguile/weaks.h
index 8a6eb467d..f9130aed3 100644
--- a/libguile/weaks.h
+++ b/libguile/weaks.h
@@ -16,7 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
@@ -40,8 +41,7 @@
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
#include "libguile/__scm.h"