diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | include/string.h | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,7 @@ +2017-02-15 Wilco Dijkstra <wdijkstr@arm.com> + + * include/string.h: Add __cplusplus check. + 2017-02-15 Gabriel F. T. Gomes <gftg@linux.vnet.ibm.com> [BZ #21134] diff --git a/include/string.h b/include/string.h index 07389f3278..45eca3c11c 100644 --- a/include/string.h +++ b/include/string.h @@ -1,6 +1,6 @@ #ifndef _STRING_H -#ifndef _ISOMAC +#if !defined _ISOMAC && !defined __cplusplus #include <sys/types.h> extern void *__memccpy (void *__dest, const void *__src, @@ -53,7 +53,7 @@ extern char *__strerror_r (int __errnum, char *__buf, size_t __buflen); above are defined as macros in the headers. */ #include <string/string.h> -#ifndef _ISOMAC +#if !defined _ISOMAC && !defined __cplusplus extern __typeof (strcoll_l) __strcoll_l; extern __typeof (strxfrm_l) __strxfrm_l; extern __typeof (strcasecmp_l) __strcasecmp_l; |