Update.

1999-06-18  H.J. Lu  <hjl@gnu.org>

	* localedata/Makefile (charmaps): Exclude SCCS.
	(locales): Likewise.
	(repertoiremaps): Likewise.

	* sysdeps/generic/bsd-_setjmp.c: Include setjmp.h.
	* sysdeps/generic/bsd-setjmp.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index c9c560f..2367f18 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
+1999-06-18  H.J. Lu  <hjl@gnu.org>
+
+       * localedata/Makefile (charmaps): Exclude SCCS.
+       (locales): Likewise.
+       (repertoiremaps): Likewise.
+
 1999-06-18  Ulrich Drepper  <drepper@cygnus.com>
 
+       * sysdeps/generic/bsd-_setjmp.c: Include setjmp.h.
+       * sysdeps/generic/bsd-setjmp.c: Likewise.
+
        * sunrpc/xdr_sizeof.c (x_inline): Cleanup pointer assignments.
 
        * iconv/gconv_open.c: Include string.h for memset prototype.

diff --git a/localedata/Makefile b/localedata/Makefile
index 099a301..fc588e1 100644 (file)
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -23,16 +23,16 @@ subdir := localedata
 all: # Make this the default target; it will be defined in Rules.
 
 # List with all available character set descriptions.
-charmaps := $(filter-out $(addprefix charmaps/, CVS RCS %~), \
+charmaps := $(filter-out $(addprefix charmaps/, CVS RCS SCCS %~), \
                                     $(wildcard charmaps/[A-I]*) \
                                     $(wildcard charmaps/[J-Z]*))
 
 # List with all available character set descriptions.
-locales := $(filter-out $(addprefix locales/, CVS RCS %~), \
+locales := $(filter-out $(addprefix locales/, CVS RCS SCCS %~), \
                                    $(wildcard locales/*))
 
 # List of repertoire maps.
-repertoiremaps := $(filter-out $(addprefix repertoiremaps/, CVS RCS %~), \
+repertoiremaps := $(filter-out $(addprefix repertoiremaps/, CVS RCS SCCS %~), \
                                           $(wildcard repertoiremaps/*))
 
 test-srcs := collate-test xfrm-test tst-fmon tst-rpmatch

diff --git a/sysdeps/generic/bsd-_setjmp.c b/sysdeps/generic/bsd-_setjmp.c
index 97d6651..11cfdc0 100644 (file)
--- a/sysdeps/generic/bsd-_setjmp.c
+++ b/sysdeps/generic/bsd-_setjmp.c
@@ -1,5 +1,5 @@
 /* BSD `setjmp' entry point to `sigsetjmp (..., 0)'.  Stub version.
-   Copyright (C) 1994, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1997, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -18,6 +18,7 @@
    Boston, MA 02111-1307, USA.  */
 
 #include <sysdep.h>
+#include <setjmp.h>
 
 #undef setjmp
 

diff --git a/sysdeps/generic/bsd-setjmp.c b/sysdeps/generic/bsd-setjmp.c
index d53263b..5c2e2a4 100644 (file)
--- a/sysdeps/generic/bsd-setjmp.c
+++ b/sysdeps/generic/bsd-setjmp.c
@@ -1,5 +1,5 @@
 /* BSD `setjmp' entry point to `sigsetjmp (..., 1)'.  Stub version.
-   Copyright (C) 1994, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1997, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -18,6 +18,7 @@
    Boston, MA 02111-1307, USA.  */
 
 #include <sysdep.h>
+#include <setjmp.h>
 
 #undef setjmp