From 665f0c2454e4d935a2bb1f869f917a7e58003d28 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 26 Jan 2007 23:11:59 +0000
Subject: [PATCH] Adjust to recent gnulib changes. * lib/.cvsignore: Remove
 stpcpy.h, strndup.h, strnlen.h. Add string.h, string_.h, unistd_.h, wchar_.h.
 * m4/.cvsignore: Add gnulib-common.m4, string_h.m4, wchar.m4. * src/system.h:
 Don't include <stpcpy.h>; this is now done by <string.h>.

---
 ChangeLog      | 9 +++++++++
 lib/.cvsignore | 7 ++++---
 m4/.cvsignore  | 3 +++
 src/system.h   | 3 +--
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 05a837d2..15041486 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-01-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Adjust to recent gnulib changes.
+	* lib/.cvsignore: Remove stpcpy.h, strndup.h, strnlen.h.
+	Add string.h, string_.h, unistd_.h, wchar_.h.
+	* m4/.cvsignore: Add gnulib-common.m4, string_h.m4, wchar.m4.
+	* src/system.h: Don't include <stpcpy.h>; this is now done by
+	<string.h>.
+
 2007-01-23  Paolo Bonzini  <bonzini@gnu.org>
 
 	Simplify implementation of unqualified %code, implement macros for
diff --git a/lib/.cvsignore b/lib/.cvsignore
index 96c0e526..b6a33891 100644
--- a/lib/.cvsignore
+++ b/lib/.cvsignore
@@ -46,21 +46,22 @@ stdint_.h
 stdio--.h
 stdio-safer.h
 stpcpy.c
-stpcpy.h
 strerror.c
+string.h
+string_.h
 stripslash.c
 strndup.c
-strndup.h
 strnlen.c
-strnlen.h
 strtol.c
 strtoul.c
 strverscmp.c
 strverscmp.h
 unistd--.h
 unistd-safer.h
+unistd_.h
 unlocked-io.h
 verify.h
+wchar_.h
 wctype_.h
 wcwidth.h
 xalloc-die.c
diff --git a/m4/.cvsignore b/m4/.cvsignore
index 1f7ac840..dea96420 100644
--- a/m4/.cvsignore
+++ b/m4/.cvsignore
@@ -10,6 +10,7 @@ extensions.m4
 getopt.m4
 gettext.m4
 gnulib-cache.m4
+gnulib-common.m4
 gnulib-comp.m4
 gnulib-tool.m4
 hash.m4
@@ -36,6 +37,7 @@ stdint_h.m4
 stdio-safer.m4
 stpcpy.m4
 strerror.m4
+string_h.m4
 strndup.m4
 strnlen.m4
 strtol.m4
@@ -45,6 +47,7 @@ unistd-safer.m4
 unistd_h.m4
 unlocked-io.m4
 warning.m4
+wchar.m4
 wchar_t.m4
 wctype.m4
 wcwidth.m4
diff --git a/src/system.h b/src/system.h
index ba0aea3e..985bbbee 100644
--- a/src/system.h
+++ b/src/system.h
@@ -1,6 +1,6 @@
 /* System-dependent definitions for Bison.
 
-   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free
    Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -59,7 +59,6 @@ typedef size_t uintptr_t;
 | Gnulib.  |
 `---------*/
 
-#include <stpcpy.h>
 #include <unlocked-io.h>
 #include <verify.h>
 #include <xalloc.h>
-- 
2.47.2