aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-12-04 16:05:57 -0500
committerDavid S. Miller <davem@davemloft.net>2012-12-04 16:05:57 -0500
commitc8df52eccfa2d1ace13d887aa6bdab1178c1edb4 (patch)
tree0681c2185383530401669efc67dcbc50eaa08028
parentc33aa6e3e38baeeede0ee9571bbb9e2436263d34 (diff)
downloadglibc-c8df52eccfa2d1ace13d887aa6bdab1178c1edb4.zip
glibc-c8df52eccfa2d1ace13d887aa6bdab1178c1edb4.tar.gz
glibc-c8df52eccfa2d1ace13d887aa6bdab1178c1edb4.tar.bz2
Fix sparc build with older compilers.
* sysdeps/generic/memcopy.h: Add multiple inclusion protection.
-rw-r--r--ChangeLog4
-rw-r--r--sysdeps/generic/memcopy.h7
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a8ae3df..5500787 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-04 David S. Miller <davem@abraco.davemloft.net>
+
+ * sysdeps/generic/memcopy.h: Add multiple inclusion protection.
+
2012-12-04 Joseph Myers <joseph@codesourcery.com>
* sysdeps/ieee754/ldbl-opt/Makefile [$(subdir) = math]
diff --git a/sysdeps/generic/memcopy.h b/sysdeps/generic/memcopy.h
index a8e5a44..631214b 100644
--- a/sysdeps/generic/memcopy.h
+++ b/sysdeps/generic/memcopy.h
@@ -1,5 +1,5 @@
/* memcopy.h -- definitions for memory copy functions. Generic C version.
- Copyright (C) 1991, 1992, 1993, 1997, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1991, 1992, 1993, 1997, 2004, 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Torbjorn Granlund (tege@sics.se).
@@ -17,6 +17,9 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
+#ifndef _MEMCOPY_H
+#define _MEMCOPY_H 1
+
/* The strategy of the memory functions is:
1. Copy bytes until the destination pointer is aligned.
@@ -144,3 +147,5 @@ extern void _wordcopy_bwd_dest_aligned (long int, long int, size_t) __THROW;
/* Threshold value for when to enter the unrolled loops. */
#define OP_T_THRES 16
+
+#endif /* memcopy.h */