[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] GNU Guile branch, master, updated. release_1-9-2-344-gd3
|
From: |
Ludovic Courtès |
|
Subject: |
[Guile-commits] GNU Guile branch, master, updated. release_1-9-2-344-gd3a6162 |
|
Date: |
Sun, 13 Sep 2009 22:45:17 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".
http://git.savannah.gnu.org/cgit/guile.git/commit/?id=d3a6162490f78e36be2c6c1c5f7319b2266ac7e0
The branch, master has been updated
via d3a6162490f78e36be2c6c1c5f7319b2266ac7e0 (commit)
via 756e8a3acfd52ed391c1f8374d85a8cca0d2bad3 (commit)
via a5229ee822a17caa46400e08bcd37e3d38b19768 (commit)
via d3d6614791099f962aa6462f937d41da2baa6d42 (commit)
via 1c44468d771d664d459e22d18884d36dda6908c1 (commit)
via b8e18ac25d00e6bf8fee1f534625d4ff5b084f42 (commit)
from 7583976b3a408471ce2146bfaa8efab2598f2531 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d3a6162490f78e36be2c6c1c5f7319b2266ac7e0
Author: Ludovic Courtès <address@hidden>
Date: Mon Sep 14 00:41:27 2009 +0200
Update `NEWS'.
commit 756e8a3acfd52ed391c1f8374d85a8cca0d2bad3
Author: Ludovic Courtès <address@hidden>
Date: Mon Sep 14 00:40:03 2009 +0200
Merge `libguile-i18n' into `libguile'.
* GUILE-VERSION (LIBGUILE_I18N_MAJOR, LIBGUILE_I18N_INTERFACE_CURRENT,
LIBGUILE_I18N_INTERFACE_REVISION, LIBGUILE_I18N_INTERFACE_AGE,
LIBGUILE_I18N_INTERFACE): Remove.
* doc/ref/api-i18n.texi (i18n Introduction): Don't mention
`libguile-i18n'.
* libguile.h: Include "libguile/i18n.h".
* libguile/Makefile.am (lib_LTLIBRARIES): Remove `libguile-i18n-v*'.
(libguile_la_SOURCES): Add `i18n.c'.
(libguile_i18n_v_*_SOURCES, libguile_i18n_v_*_CFLAGS,
libguile_i18n_v_*_LIBADD, libguile_i18n_v_*_LDFLAGS): Remove.
* libguile/i18n.c (scm_bootstrap_i18n): New function.
* libguile/i18n.h (scm_nl_langinfo, scm_init_i18n): Made internal.
(scm_bootstrap_i18n): New declaration.
* libguile/init.c (scm_i_init_guile): Invoke `scm_bootstrap_i18n ()'.
* module/ice-9/i18n.scm: Load from `libguile' instead of
`libguile-i18n-v-0'.
commit a5229ee822a17caa46400e08bcd37e3d38b19768
Author: Ludovic Courtès <address@hidden>
Date: Sun Sep 13 16:49:35 2009 +0200
Switch the `encoding*.test' files to LGPLv3+.
* test-suite/tests/encoding-escapes.test,
test-suite/tests/encoding-iso88591.test,
test-suite/tests/encoding-iso88597.test,
test-suite/tests/encoding-utf8.test: Switch to LGPLv3+ for the sake of
consistency.
commit d3d6614791099f962aa6462f937d41da2baa6d42
Author: Ludovic Courtès <address@hidden>
Date: Sun Sep 13 16:22:34 2009 +0200
Update `scm_without_guile ()' documentation.
* doc/ref/api-scheduling.texi (Blocking): Mention that
`scm_without_guile ()' & co. aren't needed any longer.
commit 1c44468d771d664d459e22d18884d36dda6908c1
Author: Ludovic Courtès <address@hidden>
Date: Sun Sep 13 15:59:31 2009 +0200
Rename "boehm-gc.h" to "bdw-gc.h"; add to the distribution.
* libguile/Makefile.am (modinclude_HEADERS): Add `bdw-gc.h'.
* libguile/bdw-gc.h: Rename from "boehm-gc.h"; users updated. Update to
LGPLv3+.
commit b8e18ac25d00e6bf8fee1f534625d4ff5b084f42
Author: Ludovic Courtès <address@hidden>
Date: Fri Sep 11 11:42:48 2009 +0200
Remove unused IA64 macro.
* libguile/threads.c (SCM_MARK_BACKING_STORE): Remove.
-----------------------------------------------------------------------
Summary of changes:
GUILE-VERSION | 6 ------
NEWS | 5 +++++
doc/ref/api-i18n.texi | 8 +-------
doc/ref/api-scheduling.texi | 19 ++++++++++++++-----
libguile.h | 1 +
libguile/Makefile.am | 14 +++-----------
libguile/{boehm-gc.h => bdw-gc.h} | 19 ++++++++++---------
libguile/gc.c | 2 +-
libguile/guardians.c | 2 +-
libguile/i18n.c | 10 ++++++++++
libguile/i18n.h | 9 ++++++---
libguile/init.c | 2 ++
libguile/inline.h | 2 +-
libguile/pthread-threads.h | 2 +-
libguile/smob.c | 2 +-
libguile/smob.h | 2 +-
libguile/srfi-4.c | 2 +-
libguile/struct.c | 2 +-
libguile/threads.c | 22 +---------------------
libguile/vectors.c | 2 +-
libguile/vm.c | 2 +-
libguile/weaks.c | 2 +-
module/ice-9/i18n.scm | 10 +++++-----
test-suite/tests/encoding-escapes.test | 27 +++++++++++++--------------
test-suite/tests/encoding-iso88591.test | 29 ++++++++++++++---------------
test-suite/tests/encoding-iso88597.test | 29 ++++++++++++++---------------
test-suite/tests/encoding-utf8.test | 29 ++++++++++++++---------------
27 files changed, 124 insertions(+), 137 deletions(-)
rename libguile/{boehm-gc.h => bdw-gc.h} (76%)
diff --git a/GUILE-VERSION b/GUILE-VERSION
index 6d86dd8..80e2916 100644
--- a/GUILE-VERSION
+++ b/GUILE-VERSION
@@ -54,9 +54,3 @@ LIBGUILE_SRFI_SRFI_60_INTERFACE_CURRENT=3
LIBGUILE_SRFI_SRFI_60_INTERFACE_REVISION=0
LIBGUILE_SRFI_SRFI_60_INTERFACE_AGE=0
LIBGUILE_SRFI_SRFI_60_INTERFACE="${LIBGUILE_SRFI_SRFI_60_INTERFACE_CURRENT}:${LIBGUILE_SRFI_SRFI_60_INTERFACE_REVISION}:${LIBGUILE_SRFI_SRFI_60_INTERFACE_AGE}"
-
-LIBGUILE_I18N_MAJOR=0
-LIBGUILE_I18N_INTERFACE_CURRENT=0
-LIBGUILE_I18N_INTERFACE_REVISION=0
-LIBGUILE_I18N_INTERFACE_AGE=0
-LIBGUILE_I18N_INTERFACE="${LIBGUILE_I18N_INTERFACE_CURRENT}:${LIBGUILE_INTERFACE_REVISION}:${LIBGUILE_I18N_INTERFACE_AGE}"
diff --git a/NEWS b/NEWS
index ca7ddf6..04b6b39 100644
--- a/NEWS
+++ b/NEWS
@@ -105,6 +105,11 @@ unlikely that any code out there actually used this
functionality.
GOOPS, Guile's object system, used to be documented in separate manuals.
This content is now included in Guile's manual directly.
+** `libguile-i18n' has been merged into `libguile'
+
+The C support code for `(ice-9 i18n)', which used to be in
+`libguile-i18n', is now part of `libguile'.
+
** Last but not least, the `λ' macro can be used in lieu of `lambda'
** And of course, the usual collection of bugfixes
diff --git a/doc/ref/api-i18n.texi b/doc/ref/api-i18n.texi
index be5afe4..8bc9896 100644
--- a/doc/ref/api-i18n.texi
+++ b/doc/ref/api-i18n.texi
@@ -1,6 +1,6 @@
@c -*-texinfo-*-
@c This is part of the GNU Guile Reference Manual.
address@hidden Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2006,
2007
address@hidden Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2006,
2007, 2009
@c Free Software Foundation, Inc.
@c See the file guile.texi for copying conditions.
@@ -39,12 +39,6 @@ In order to make use of the functions described thereafter,
the
(use-modules (ice-9 i18n))
@end example
address@hidden address@hidden
-
-C programs can use the C functions corresponding to the procedures of
-this module by including @code{<libguile/i18n.h>} and by linking
-against @address@hidden
-
@cindex cultural conventions
The @code{(ice-9 i18n)} module provides procedures to manipulate text
diff --git a/doc/ref/api-scheduling.texi b/doc/ref/api-scheduling.texi
index 5213696..34697d3 100644
--- a/doc/ref/api-scheduling.texi
+++ b/doc/ref/api-scheduling.texi
@@ -1,6 +1,6 @@
@c -*-texinfo-*-
@c This is part of the GNU Guile Reference Manual.
address@hidden Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2007
address@hidden Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2007,
2009
@c Free Software Foundation, Inc.
@c See the file guile.texi for copying conditions.
@@ -542,10 +542,19 @@ which only ever executes on behalf of one process at any
one time.
@node Blocking
@subsection Blocking in Guile Mode
-A thread must not block outside of a libguile function while it is in
-guile mode. The following functions can be used to temporily leave
-guile mode or to perform some common blocking operations in a supported
-way.
+Up to Guile version 1.8, a thread blocked in guile mode would prevent
+the garbage collector from running. Thus threads had to explicitly
+leave guile mode with @code{scm_without_guile ()} before making a
+potentially blocking call such as a mutex lock, a @code{select ()}
+system call, etc. The following functions could be used to temporarily
+leave guile mode or to perform some common blocking operations in a
+supported way.
+
+Starting from Guile 2.0, blocked threads no longer hinder garbage
+collection. Thus, the functions below are not needed anymore. They can
+still be used to inform the GC that a thread is about to block, giving
+it a (small) optimization opportunity for ``stop the world'' garbage
+collections, should they occur while the thread is blocked.
@deftypefn {C Function} {void *} scm_without_guile (void *(*func) (void *),
void *data)
Leave guile mode, call @var{func} on @var{data}, enter guile mode and
diff --git a/libguile.h b/libguile.h
index 74674d5..7967c2b 100644
--- a/libguile.h
+++ b/libguile.h
@@ -61,6 +61,7 @@ extern "C" {
#include "libguile/guardians.h"
#include "libguile/hash.h"
#include "libguile/hashtab.h"
+#include "libguile/i18n.h"
#include "libguile/init.h"
#include "libguile/ioext.h"
#include "libguile/rdelim.h"
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 046ce21..f4f1282 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -43,8 +43,7 @@ gnulib_library = $(top_builddir)/lib/libgnu.la
ETAGS_ARGS =
--regex='/SCM_\(GLOBAL_\)?\(G?PROC\|G?PROC1\|SYMBOL\|VCELL\|CONST_LONG\).*\"\([^\"]\)*\"/\3/'
\
--regex='/[ \t]*SCM_[G]?DEFINE1?[ \t]*(\([^,]*\),[^,]*/\1/'
-lib_LTLIBRARIES = libguile.la \
- address@hidden@.la
+lib_LTLIBRARIES = libguile.la
bin_PROGRAMS = guile
noinst_PROGRAMS = guile_filter_doc_snarfage gen-scmconfig
@@ -145,6 +144,7 @@ libguile_la_SOURCES = \
hash.c \
hashtab.c \
hooks.c \
+ i18n.c \
init.c \
inline.c \
instructions.c \
@@ -203,15 +203,6 @@ libguile_la_SOURCES = \
vports.c \
weaks.c
address@hidden@_la_SOURCES = i18n.c
address@hidden@_la_CFLAGS = \
- $(libguile_la_CFLAGS)
address@hidden@_la_LIBADD = \
- libguile.la $(gnulib_library)
address@hidden@_la_LDFLAGS = \
- -module -L$(builddir) -lguile \
- -version-info @LIBGUILE_I18N_INTERFACE@
-
DOT_X_FILES = \
alist.x \
arbiters.x \
@@ -465,6 +456,7 @@ modinclude_HEADERS = \
arrays.h \
async.h \
backtrace.h \
+ bdw-gc.h \
boolean.h \
bitvectors.h \
bytevectors.h \
diff --git a/libguile/boehm-gc.h b/libguile/bdw-gc.h
similarity index 76%
rename from libguile/boehm-gc.h
rename to libguile/bdw-gc.h
index b3a8514..a54785e 100644
--- a/libguile/boehm-gc.h
+++ b/libguile/bdw-gc.h
@@ -1,21 +1,22 @@
-#ifndef SCM_BOEHM_GC_H
-#define SCM_BOEHM_GC_H
+#ifndef SCM_BDW_GC_H
+#define SCM_BDW_GC_H
/* Copyright (C) 2006, 2008, 2009 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 3 of
+ * the License, or (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
*/
/* Correct header inclusion. */
@@ -45,4 +46,4 @@
typedef void *GC_PTR;
#endif
-#endif /* SCM_BOEHM_GC_H */
+#endif /* SCM_BDW_GC_H */
diff --git a/libguile/gc.c b/libguile/gc.c
index d3c53c7..7c508af 100644
--- a/libguile/gc.c
+++ b/libguile/gc.c
@@ -56,7 +56,7 @@ extern unsigned long *
__libc_ia64_register_backing_store_base;
#include "libguile/gc.h"
#include "libguile/dynwind.h"
-#include "libguile/boehm-gc.h"
+#include "libguile/bdw-gc.h"
#ifdef GUILE_DEBUG_MALLOC
#include "libguile/debug-malloc.h"
diff --git a/libguile/guardians.c b/libguile/guardians.c
index 580e212..51aa433 100644
--- a/libguile/guardians.c
+++ b/libguile/guardians.c
@@ -62,7 +62,7 @@
#include "libguile/eval.h"
#include "libguile/guardians.h"
-#include "libguile/boehm-gc.h"
+#include "libguile/bdw-gc.h"
diff --git a/libguile/i18n.c b/libguile/i18n.c
index fd15227..4b7eb04 100644
--- a/libguile/i18n.c
+++ b/libguile/i18n.c
@@ -23,6 +23,7 @@
#include <alloca.h>
#include "libguile/_scm.h"
+#include "libguile/extensions.h"
#include "libguile/feature.h"
#include "libguile/i18n.h"
#include "libguile/strings.h"
@@ -1707,6 +1708,15 @@ scm_init_i18n ()
SCM_VARIABLE_SET (scm_global_locale, global_locale_smob);
}
+void
+scm_bootstrap_i18n ()
+{
+ scm_c_register_extension ("libguile", "scm_init_i18n",
+ (scm_t_extension_init_func) scm_init_i18n,
+ NULL);
+
+}
+
/*
Local Variables:
diff --git a/libguile/i18n.h b/libguile/i18n.h
index df2970b..16045eb 100644
--- a/libguile/i18n.h
+++ b/libguile/i18n.h
@@ -3,7 +3,7 @@
#ifndef SCM_I18N_H
#define SCM_I18N_H
-/* Copyright (C) 2006, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 2006, 2008, 2009 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -42,9 +42,12 @@ SCM_API SCM scm_string_locale_upcase (SCM chr, SCM locale);
SCM_API SCM scm_string_locale_downcase (SCM chr, SCM locale);
SCM_API SCM scm_locale_string_to_integer (SCM str, SCM base, SCM locale);
SCM_API SCM scm_locale_string_to_inexact (SCM str, SCM locale);
-SCM_API SCM scm_nl_langinfo (SCM item, SCM locale);
-SCM_API void scm_init_i18n (void);
+SCM_INTERNAL SCM scm_nl_langinfo (SCM item, SCM locale);
+
+SCM_INTERNAL void scm_init_i18n (void);
+SCM_INTERNAL void scm_bootstrap_i18n (void);
+
#endif /* SCM_I18N_H */
diff --git a/libguile/init.c b/libguile/init.c
index 940d515..3fbe368 100644
--- a/libguile/init.c
+++ b/libguile/init.c
@@ -71,6 +71,7 @@
#include "libguile/hashtab.h"
#include "libguile/hooks.h"
#include "libguile/gettext.h"
+#include "libguile/i18n.h"
#include "libguile/iselect.h"
#include "libguile/ioext.h"
#include "libguile/keywords.h"
@@ -561,6 +562,7 @@ scm_i_init_guile (SCM_STACKITEM *base)
scm_init_load_path ();
scm_init_standard_ports (); /* Requires fports */
scm_init_dynamic_linking ();
+ scm_bootstrap_i18n ();
#if SCM_ENABLE_ELISP
scm_init_lang ();
#endif /* SCM_ENABLE_ELISP */
diff --git a/libguile/inline.h b/libguile/inline.h
index 4943169..93be809 100644
--- a/libguile/inline.h
+++ b/libguile/inline.h
@@ -78,7 +78,7 @@
"inline.c", when `inline' is not supported at all or when "extern inline"
is used. */
-#include "libguile/boehm-gc.h"
+#include "libguile/bdw-gc.h"
SCM_API SCM scm_cell (scm_t_bits car, scm_t_bits cdr);
diff --git a/libguile/pthread-threads.h b/libguile/pthread-threads.h
index 4f72a42..ca72f16 100644
--- a/libguile/pthread-threads.h
+++ b/libguile/pthread-threads.h
@@ -30,7 +30,7 @@
#include <sched.h>
/* `libgc' intercepts pthread calls by defining wrapping macros. */
-#include "libguile/boehm-gc.h"
+#include "libguile/bdw-gc.h"
/* Threads
*/
diff --git a/libguile/smob.c b/libguile/smob.c
index 86bb22f..22b90ad 100644
--- a/libguile/smob.c
+++ b/libguile/smob.c
@@ -38,7 +38,7 @@
#include "libguile/smob.h"
-#include "libguile/boehm-gc.h"
+#include "libguile/bdw-gc.h"
#include <gc/gc_mark.h>
diff --git a/libguile/smob.h b/libguile/smob.h
index d435bac..ca4a418 100644
--- a/libguile/smob.h
+++ b/libguile/smob.h
@@ -26,7 +26,7 @@
#include "libguile/__scm.h"
#include "libguile/print.h"
-#include "libguile/boehm-gc.h"
+#include "libguile/bdw-gc.h"
diff --git a/libguile/srfi-4.c b/libguile/srfi-4.c
index 3024143..af8eaa3 100644
--- a/libguile/srfi-4.c
+++ b/libguile/srfi-4.c
@@ -28,7 +28,7 @@
#include "libguile/_scm.h"
#include "libguile/__scm.h"
-#include "libguile/boehm-gc.h"
+#include "libguile/bdw-gc.h"
#include "libguile/srfi-4.h"
#include "libguile/bitvectors.h"
#include "libguile/bytevectors.h"
diff --git a/libguile/struct.c b/libguile/struct.c
index b7e72a7..7b25f7f 100644
--- a/libguile/struct.c
+++ b/libguile/struct.c
@@ -41,7 +41,7 @@
#include <string.h>
#endif
-#include "libguile/boehm-gc.h"
+#include "libguile/bdw-gc.h"
diff --git a/libguile/threads.c b/libguile/threads.c
index 3def0f3..66e3474 100644
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@ -22,7 +22,7 @@
# include <config.h>
#endif
-#include "libguile/boehm-gc.h"
+#include "libguile/bdw-gc.h"
#include "libguile/_scm.h"
#if HAVE_UNISTD_H
@@ -1596,26 +1596,6 @@ SCM_DEFINE (scm_condition_variable_p,
"condition-variable?", 1, 0, 0,
}
#undef FUNC_NAME
-/*** Marking stacks */
-
-/* XXX - what to do with this? Do we need to handle this for blocked
- threads as well?
-*/
-#ifdef __ia64__
-# define SCM_MARK_BACKING_STORE() do { \
- ucontext_t ctx; \
- SCM_STACKITEM * top, * bot; \
- getcontext (&ctx); \
- scm_mark_locations ((SCM_STACKITEM *) &ctx.uc_mcontext, \
- ((size_t) (sizeof (SCM_STACKITEM) - 1 + sizeof ctx.uc_mcontext) \
- / sizeof (SCM_STACKITEM))); \
- bot = (SCM_STACKITEM *) SCM_I_CURRENT_THREAD->register_backing_store_base;
\
- top = (SCM_STACKITEM *) scm_ia64_ar_bsp (&ctx); \
- scm_mark_locations (bot, top - bot); } while (0)
-#else
-# define SCM_MARK_BACKING_STORE()
-#endif
-
/*** Select */
diff --git a/libguile/vectors.c b/libguile/vectors.c
index 190e3e3..4198c54 100644
--- a/libguile/vectors.c
+++ b/libguile/vectors.c
@@ -41,7 +41,7 @@
#include "libguile/dynwind.h"
#include "libguile/deprecation.h"
-#include "libguile/boehm-gc.h"
+#include "libguile/bdw-gc.h"
diff --git a/libguile/vm.c b/libguile/vm.c
index 95aaa4f..aee2768 100644
--- a/libguile/vm.c
+++ b/libguile/vm.c
@@ -25,7 +25,7 @@
#include <string.h>
#include <assert.h>
-#include "libguile/boehm-gc.h"
+#include "libguile/bdw-gc.h"
#include <gc/gc_mark.h>
#include "_scm.h"
diff --git a/libguile/weaks.c b/libguile/weaks.c
index 92fb305..abe9292 100644
--- a/libguile/weaks.c
+++ b/libguile/weaks.c
@@ -32,7 +32,7 @@
#include "libguile/validate.h"
#include "libguile/weaks.h"
-#include "libguile/boehm-gc.h"
+#include "libguile/bdw-gc.h"
#include <gc/gc_typed.h>
diff --git a/module/ice-9/i18n.scm b/module/ice-9/i18n.scm
index dd14e67..e63ec74 100644
--- a/module/ice-9/i18n.scm
+++ b/module/ice-9/i18n.scm
@@ -1,22 +1,22 @@
;;;; i18n.scm --- internationalization support
-;;;; Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+;;;; Copyright (C) 2006, 2007, 2009 Free Software Foundation, Inc.
;;;;
;;;; This library is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU Lesser General Public
;;;; License as published by the Free Software Foundation; either
;;;; version 3 of the License, or (at your option) any later version.
-;;;;
+;;;;
;;;; This library 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
;;;; Lesser General Public License for more details.
-;;;;
+;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; if not, write to the Free Software
;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
-;;; Author: Ludovic Courtès <address@hidden>
+;;; Author: Ludovic Courtès <address@hidden>
;;; Commentary:
;;;
@@ -84,7 +84,7 @@
(eval-when (eval load compile)
- (load-extension "libguile-i18n-v-0" "scm_init_i18n"))
+ (load-extension "libguile" "scm_init_i18n"))
;;;
diff --git a/test-suite/tests/encoding-escapes.test
b/test-suite/tests/encoding-escapes.test
index ea7a821..85f613f 100644
--- a/test-suite/tests/encoding-escapes.test
+++ b/test-suite/tests/encoding-escapes.test
@@ -1,21 +1,20 @@
;;;; encoding-escapes.test --- test suite for Guile's string encodings -*-
mode: scheme; coding: utf-8 -*-
;;;;
;;;; Copyright (C) 2009 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,
+;;;;
+;;;; This library is free software; you can redistribute it and/or
+;;;; modify it under the terms of the GNU Lesser General Public
+;;;; License as published by the Free Software Foundation; either
+;;;; version 3 of the License, or (at your option) any later version.
+;;;;
+;;;; This library 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, Inc., 51 Franklin Street, Fifth Floor,
-;;;; Boston, MA 02110-1301 USA
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+;;;; Lesser General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU Lesser General Public
+;;;; License along with this library; if not, write to the Free Software
+;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
(define-module (test-strings)
#:use-module (test-suite lib)
diff --git a/test-suite/tests/encoding-iso88591.test
b/test-suite/tests/encoding-iso88591.test
index b4d48a6..32d2ed5 100644
--- a/test-suite/tests/encoding-iso88591.test
+++ b/test-suite/tests/encoding-iso88591.test
@@ -1,21 +1,20 @@
-;;;; strings.test --- test suite for Guile's string functions -*- mode:
scheme; coding: iso-8859-1 -*-
+;;;; encoding-iso88591.test --- test suite for Guile's string encodings -*-
mode: scheme; coding: iso-8859-1 -*-
;;;;
;;;; Copyright (C) 2009 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,
+;;;;
+;;;; This library is free software; you can redistribute it and/or
+;;;; modify it under the terms of the GNU Lesser General Public
+;;;; License as published by the Free Software Foundation; either
+;;;; version 3 of the License, or (at your option) any later version.
+;;;;
+;;;; This library 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, Inc., 51 Franklin Street, Fifth Floor,
-;;;; Boston, MA 02110-1301 USA
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+;;;; Lesser General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU Lesser General Public
+;;;; License along with this library; if not, write to the Free Software
+;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
(define-module (test-strings)
#:use-module (test-suite lib)
diff --git a/test-suite/tests/encoding-iso88597.test
b/test-suite/tests/encoding-iso88597.test
index 8c155d2..eae3fab 100644
--- a/test-suite/tests/encoding-iso88597.test
+++ b/test-suite/tests/encoding-iso88597.test
@@ -1,21 +1,20 @@
-;;;; strings.test --- test suite for Guile's string functions -*- mode:
scheme; coding: iso-8859-7 -*-
+;;;; encoding-iso88697.test --- test suite for Guile's string encodings -*-
mode: scheme; coding: iso-8859-7 -*-
;;;;
;;;; Copyright (C) 2009 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,
+;;;;
+;;;; This library is free software; you can redistribute it and/or
+;;;; modify it under the terms of the GNU Lesser General Public
+;;;; License as published by the Free Software Foundation; either
+;;;; version 3 of the License, or (at your option) any later version.
+;;;;
+;;;; This library 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, Inc., 51 Franklin Street, Fifth Floor,
-;;;; Boston, MA 02110-1301 USA
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+;;;; Lesser General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU Lesser General Public
+;;;; License along with this library; if not, write to the Free Software
+;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
(define-module (test-strings)
#:use-module (test-suite lib)
diff --git a/test-suite/tests/encoding-utf8.test
b/test-suite/tests/encoding-utf8.test
index d2bdb69..d5e6370 100644
--- a/test-suite/tests/encoding-utf8.test
+++ b/test-suite/tests/encoding-utf8.test
@@ -1,21 +1,20 @@
-;;;; strings.test --- test suite for Guile's string functions -*- mode:
scheme; coding: utf-8 -*-
+;;;; encoding-utf8.test --- test suite for Guile's string encodings -*-
mode: scheme; coding: utf-8 -*-
;;;;
;;;; Copyright (C) 2009 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,
+;;;;
+;;;; This library is free software; you can redistribute it and/or
+;;;; modify it under the terms of the GNU Lesser General Public
+;;;; License as published by the Free Software Foundation; either
+;;;; version 3 of the License, or (at your option) any later version.
+;;;;
+;;;; This library 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, Inc., 51 Franklin Street, Fifth Floor,
-;;;; Boston, MA 02110-1301 USA
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+;;;; Lesser General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU Lesser General Public
+;;;; License along with this library; if not, write to the Free Software
+;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
(define-module (test-strings)
#:use-module (test-suite lib)
hooks/post-receive
--
GNU Guile
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Guile-commits] GNU Guile branch, master, updated. release_1-9-2-344-gd3a6162,
Ludovic Courtès <=