strdup.h is replaced by <string.h>.

diff --git a/gettext-tools/libgrep/ChangeLog b/gettext-tools/libgrep/ChangeLog
index 1a57ec9366367440bfb73fbe1497a64f00f65497..ca43c8c9740bdb24c674fb53e11c06facce5cff6 100644 (file)
--- a/gettext-tools/libgrep/ChangeLog
+++ b/gettext-tools/libgrep/ChangeLog
@@ -1,3 +1,14 @@
+2007-01-26  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (LIBADD_SOURCE): Remove strdup.h.
+
+2007-01-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * strdup.h: Remove file.
+       * strdup.c: Don't include no-longer-existent include files. Rely on
+       <string.h> instead.
+       * hard-locale.c: Likewise.
+
 2006-11-03  Bruno Haible  <bruno@clisp.org>
 
        Simplify xmalloc expressions. Add overflow check in xmalloc arguments.

diff --git a/gettext-tools/libgrep/Makefile.am b/gettext-tools/libgrep/Makefile.am
index 9b0d1253a9875256286030ac4c4d647aef14bbc3..51c1f884011f35bfa40e2601437526f988624c81 100644 (file)
--- a/gettext-tools/libgrep/Makefile.am
+++ b/gettext-tools/libgrep/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for libgrep directory in GNU gettext package.
-## Copyright (C) 2005-2006 Free Software Foundation, Inc.
+## Copyright (C) 2005-2007 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
@@ -37,7 +37,7 @@ libgrep_a_SOURCES = \
 LIBADD_SOURCE = \
   memchr.c \
   regex.h regex.c \
-  strdup.h strdup.c
+  strdup.c
 
 # How to build libgrep.a.
 libgrep_a_LIBADD = @LIBGREPOBJS@

diff --git a/gettext-tools/libgrep/hard-locale.c b/gettext-tools/libgrep/hard-locale.c
index 8725f9e7649ea90092aa910eec305d7f1d6c2610..c1b74a3c3156c0b0fcbb27679bf384b50ceee42b 100644 (file)
--- a/gettext-tools/libgrep/hard-locale.c
+++ b/gettext-tools/libgrep/hard-locale.c
@@ -1,6 +1,6 @@
 /* hard-locale.c -- Determine whether a locale is hard.
 
-   Copyright (C) 1997-1999, 2002-2005 Free Software Foundation, Inc.
+   Copyright (C) 1997-1999, 2002-2005, 2007 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
@@ -26,8 +26,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "strdup.h"
-
 #ifdef __GLIBC__
 # define GLIBC_VERSION __GLIBC__
 #else

diff --git a/gettext-tools/libgrep/strdup.c b/gettext-tools/libgrep/strdup.c
index 17d40d622d8643198404668bf51d17297bd89b61..c614108786854179a5499ab49b9b5a66cc33e472 100644 (file)
--- a/gettext-tools/libgrep/strdup.c
+++ b/gettext-tools/libgrep/strdup.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1996, 1997, 1998, 2002, 2003, 2004, 2006 Free
+/* Copyright (C) 1991, 1996, 1997, 1998, 2002, 2003, 2004, 2006, 2007 Free
    Software Foundation, Inc.
 
    This file is part of the GNU C Library.
@@ -19,13 +19,13 @@
 
 #ifndef _LIBC
 # include <config.h>
-/* Get specification.  */
-# include "strdup.h"
 #endif
 
-#include <stdlib.h>
+/* Get specification.  */
 #include <string.h>
 
+#include <stdlib.h>
+
 #undef __strdup
 #ifdef _LIBC
 # undef strdup

diff --git a/gettext-tools/libgrep/strdup.h b/gettext-tools/libgrep/strdup.h
deleted file mode 100644 (file)
index a0d5fb9..0000000
--- a/gettext-tools/libgrep/strdup.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* strdup.h -- duplicate a string
-   Copyright (C) 2004 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 program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifndef STRDUP_H_
-#define STRDUP_H_
-
-/* Get strdup declaration, if available.  */
-#include <string.h>
-
-#if defined HAVE_DECL_STRDUP && !HAVE_DECL_STRDUP && !defined strdup
-/* Duplicate S, returning an identical malloc'd string.  */
-extern char *strdup (const char *s);
-#endif
-
-#endif /* STRDUP_H_ */