X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmempcpy.h;h=fa2032107ad2d9b9cfd88614304501035a7a903b;hb=fb84631f1ec8e82d252cbad0b5b7f83a98e74ba9;hp=577745055dafb096dbc30cd3b3c8bfd13deffd76;hpb=521cb5f96a03acba4dd1b3502edff17aa8b52d76;p=gnulib.git

diff --git a/lib/mempcpy.h b/lib/mempcpy.h
index 577745055..fa2032107 100644
--- a/lib/mempcpy.h
+++ b/lib/mempcpy.h
@@ -1,5 +1,5 @@
 /* Copy memory area and return pointer after last written byte.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 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
@@ -13,20 +13,24 @@
 
    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.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_MEMPCPY
+#ifndef mempcpy
+
+# if HAVE_MEMPCPY
 
 /* Get mempcpy() declaration.  */
-#include <string.h>
+#  include <string.h>
 
-#else
+# else
 
 /* Get size_t */
-#include <stddef.h>
+#  include <stddef.h>
 
 /* Copy N bytes of SRC to DEST, return pointer to bytes after the
    last written byte.  */
 extern void *mempcpy (void *dest, const void *src, size_t n);
 
+# endif
+
 #endif