commit c2a91b1b2ecb8d862d89befd8ecd036fed14b49a
author Andrew Boie <andrew.p.boie@intel.com> Thu Feb 02 12:01:59 2017 -0800
committer Anas Nashif <nashif@linux.intel.com> Sat Feb 04 19:22:07 2017 +0000
tree 71ec4bb48d6ee883a8ab1c3aed3765039772d24b
parent 6b5af856d39fb73fcf4fe5cd72fe7ba58ae2df78

libc: minimal: rename private macro

As it turns out Xtensa SDK headers also define _Restrict, causing
havoc. As this was intended to be a private macro, rename it to something
less likely to cause a collision.

Change-Id: I0a7501a1af8cf87efb096872a91a7b44bd2bbdca
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>

lib/libc/minimal/source/string/string.c

diff --git a/lib/libc/minimal/source/string/string.c b/lib/libc/minimal/source/string/string.c
index d318839..aa7ec04 100644
--- a/lib/libc/minimal/source/string/string.c
+++ b/lib/libc/minimal/source/string/string.c
@@ -15,7 +15,7 @@
  * @return pointer to destination buffer <d>
  */
 
-char *strcpy(char *_Restrict d, const char *_Restrict s)
+char *strcpy(char *_MLIBC_RESTRICT d, const char *_MLIBC_RESTRICT s)
 {
 	char *dest = d;
 
@@ -37,7 +37,7 @@
  * @return pointer to destination buffer <d>
  */
 
-char *strncpy(char *_Restrict d, const char *_Restrict s, size_t n)
+char *strncpy(char *_MLIBC_RESTRICT d, const char *_MLIBC_RESTRICT s, size_t n)
 {
 	char *dest = d;
 
@@ -148,13 +148,14 @@
 	return (n == 0) ? 0 : (*s1 - *s2);
 }
 
-char *strcat(char *_Restrict dest, const char *_Restrict src)
+char *strcat(char *_MLIBC_RESTRICT dest, const char *_MLIBC_RESTRICT src)
 {
 	strcpy(dest + strlen(dest), src);
 	return dest;
 }
 
-char *strncat(char *_Restrict dest, const char *_Restrict src, size_t n)
+char *strncat(char *_MLIBC_RESTRICT dest, const char *_MLIBC_RESTRICT src,
+	      size_t n)
 {
 	char *orig_dest = dest;
 	size_t len = strlen(dest);
@@ -232,7 +233,7 @@
  * @return pointer to start of destination buffer
  */
 
-void *memcpy(void *_Restrict d, const void *_Restrict s, size_t n)
+void *memcpy(void *_MLIBC_RESTRICT d, const void *_MLIBC_RESTRICT s, size_t n)
 {
 	/* attempt word-sized copying only if buffers have identical alignment */