X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fstring.h;h=034e2953df7503db3e4768be9f7c1b387271c16e;hb=0f1753c9c476b500f52755d1cc07c1eb6927e49a;hp=99cc2d3f593e6bc21d5ac676f423c4eee3d9d6e5;hpb=9975e3d37d8585b41db075321bade3495cf58cdb;p=platform%2Fupstream%2Fglibc.git

diff --git a/include/string.h b/include/string.h
index 99cc2d3..034e295 100644
--- a/include/string.h
+++ b/include/string.h
@@ -57,7 +57,7 @@ extern __typeof (strcasecmp_l) __strcasecmp_l;
 extern __typeof (strncasecmp_l) __strncasecmp_l;
 
 /* Alternative version which doesn't pollute glibc's namespace.  */
-#ifndef NOT_IN_libc
+#if IS_IN (libc)
 # undef strndupa
 # define strndupa(s, n)							      \
   (__extension__							      \
@@ -115,7 +115,8 @@ libc_hidden_builtin_proto (strspn)
 libc_hidden_builtin_proto (strstr)
 libc_hidden_builtin_proto (ffs)
 
-#if defined NOT_IN_libc || !defined SHARED
+#if (!IS_IN (libc) || !defined SHARED) \
+  && !defined NO_MEMPCPY_STPCPY_REDIRECT
 /* Redirect calls to __builtin_mempcpy and __builtin_stpcpy to call
    __mempcpy and __stpcpy if not inlined.  */
 extern __typeof (mempcpy) mempcpy __asm__ ("__mempcpy");