From: Ben Pfaff <blp@gnu.org>
Date: Fri, 13 Feb 2004 19:23:23 +0000 (+0000)
Subject: Don't #include "str.h" in stpcpy.c.
X-Git-Tag: v0.4.0~362
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eda74e68d8966cb3389029d60bf2a902f9e63328;p=pspp-builds.git

Don't #include "str.h" in stpcpy.c.
---

diff --git a/lib/misc/ChangeLog b/lib/misc/ChangeLog
index d0a92698..3128afa3 100644
--- a/lib/misc/ChangeLog
+++ b/lib/misc/ChangeLog
@@ -1,3 +1,7 @@
+Fri Feb 13 11:21:46 2004  Ben Pfaff  <blp@gnu.org>
+
+	* stpcpy.c: Don't #include "str.h".
+
 Sat Dec 27 16:37:07 2003  Ben Pfaff  <blp@gnu.org>
 
 	* Makefile.am: (EXTRA_DIST) Add getopt.c, getopt1.c, memcpy.c,
diff --git a/lib/misc/stpcpy.c b/lib/misc/stpcpy.c
index b9df2972..b87f40fa 100644
--- a/lib/misc/stpcpy.c
+++ b/lib/misc/stpcpy.c
@@ -19,22 +19,8 @@
 
 #include <stddef.h>
 
-/* Some old versions of Linux libc prototype stpcpy() in string.h but
-   fail to include it in their C library.  By not including string.h
-   on these systems we can avoid conflicting prototypes.  Of course,
-   in theory this might be dangerous, if the prototype specifies some
-   weird calling convention, but for GNU/Linux at least it shouldn't
-   cause problems.
-
-   This might be needed for systems other than GNU/Linux; let me
-   know. */
-
-#ifdef __linux__
 void *memcpy (void *, const void *, size_t);
 size_t strlen (const char *);
-#else
-#include "str.h"
-#endif
 
 /* Copies SRC to DEST, returning the address of the terminating '\0'
    in DEST. */