summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2002-11-26 22:58:57 +0000
committerKarl Berry <karl@freefriends.org>2002-11-26 22:58:57 +0000
commit8ee0415dbe113fd16461ea60be8f1851e95565cc (patch)
tree1bbfde274107440a657ce36150be2914bcdb0cba /lib
parentecc8e81fda8d43d151d4832abe75fc92a4b2f34d (diff)
downloadgnulib-8ee0415dbe113fd16461ea60be8f1851e95565cc.tar.gz
copy strdup.c from libc again.
Diffstat (limited to 'lib')
-rw-r--r--lib/.cppi-disable1
-rw-r--r--lib/ChangeLog5
-rw-r--r--lib/strdup.c8
3 files changed, 9 insertions, 5 deletions
diff --git a/lib/.cppi-disable b/lib/.cppi-disable
index 7bd80c2699..81537e743e 100644
--- a/lib/.cppi-disable
+++ b/lib/.cppi-disable
@@ -9,3 +9,4 @@ md5.h
obstack.h
regex.c
regex.h
+strdup.c
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 38b6653a7e..3c12748ab0 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-26 <karl@gnu.org>
+
+ * strdup.c: copy from libc again, with jim's ok.
+ * .cppi-disable: re-add strdup.c
+
2002-11-25 <karl@gnu.org>
* strtoll.c: copy from libc, meaning we now #include <strtol.c>
diff --git a/lib/strdup.c b/lib/strdup.c
index 06260fa033..5aa09a652c 100644
--- a/lib/strdup.c
+++ b/lib/strdup.c
@@ -15,8 +15,8 @@
with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-#if HAVE_CONFIG_H
-# include <config.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
#endif
#if defined _LIBC || defined STDC_HEADERS
@@ -34,9 +34,7 @@ char *memcpy ();
# define __strdup strdup
#endif
-/* Duplicate S, returning an identical malloc'd string.
- Return NULL if out of memory. */
-
+/* Duplicate S, returning an identical malloc'd string. */
char *
__strdup (const char *s)
{