aboutsummaryrefslogtreecommitdiff
path: root/string/string.h
diff options
context:
space:
mode:
authorTulio Magno Quites Machado Filho <tuliom@linux.ibm.com>2020-03-23 11:28:47 -0300
committerTulio Magno Quites Machado Filho <tuliom@linux.ibm.com>2020-03-23 11:28:47 -0300
commite51e3044e1fa121bb1c308614a49c72e69d2ed6b (patch)
treec8877c961fb367be2f035f1b2e355ff57baf28a9 /string/string.h
parentf71df694b107b1ec310f8bc668cb8a5eb27936a5 (diff)
parent21344a3d62a29406fddeec069ee4eb3c341369f9 (diff)
downloadglibc-e51e3044e1fa121bb1c308614a49c72e69d2ed6b.tar
glibc-e51e3044e1fa121bb1c308614a49c72e69d2ed6b.tar.gz
glibc-e51e3044e1fa121bb1c308614a49c72e69d2ed6b.tar.bz2
glibc-e51e3044e1fa121bb1c308614a49c72e69d2ed6b.zip
Merge branch release/2.28/master into ibm/2.28/master
Diffstat (limited to 'string/string.h')
-rw-r--r--string/string.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/string/string.h b/string/string.h
index 150cfd8b13..22cd0fa08f 100644
--- a/string/string.h
+++ b/string/string.h
@@ -33,7 +33,8 @@ __BEGIN_DECLS
#include <stddef.h>
/* Tell the caller that we provide correct C++ prototypes. */
-#if defined __cplusplus && __GNUC_PREREQ (4, 4)
+#if defined __cplusplus && (__GNUC_PREREQ (4, 4) \
+ || __glibc_clang_prereq (3, 5))
# define __CORRECT_ISO_CPP_STRING_H_PROTO
#endif