X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fmisc%2Fstpcpy.c;h=579d4617dda5e828df8ad6f85bbf35f8709c4f58;hb=1f8dd363d6c20d07fcca14cb948018465fa5ed8b;hp=b9df2972a37be17577863ae10db395d31815d99f;hpb=4944c86a9318bc5b5578ab145a95c116ffd2c9fd;p=pspp

diff --git a/lib/misc/stpcpy.c b/lib/misc/stpcpy.c
index b9df2972a3..579d4617dd 100644
--- a/lib/misc/stpcpy.c
+++ b/lib/misc/stpcpy.c
@@ -14,27 +14,13 @@
 
    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., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA. */
 
 #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. */