summaryrefslogtreecommitdiff
path: root/string/string.h
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@codesourcery.com>2015-01-23 17:01:40 +0100
committerThomas Schwinge <thomas@codesourcery.com>2015-01-23 17:01:40 +0100
commitbd42a4599d1b6f77bcfe1e4f67b7cbd9e1cb2dfd (patch)
tree5d1dc07a79f0b70a724ea17add3ccfefed1e6fc4 /string/string.h
parentbad1169e8a095104d8b37a3339d5f03862eb788a (diff)
parent58695b88a9deaecbcf7794760cc333177edaa2b4 (diff)
Merge commit 'refs/top-bases/t/bigmem' into t/bigmem
Diffstat (limited to 'string/string.h')
-rw-r--r--string/string.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/string/string.h b/string/string.h
index ecc3fef1bd..b127e8d9dd 100644
--- a/string/string.h
+++ b/string/string.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -31,8 +31,12 @@ __BEGIN_DECLS
#define __need_NULL
#include <stddef.h>
-/* Tell the caller that we provide correct C++ prototypes. */
-#if defined __cplusplus && __GNUC_PREREQ (4, 4)
+/* Provide correct C++ prototypes, and indicate this to the caller. This
+ requires a compatible C++ standard library. As a heuristic, we provide
+ these when the compiler indicates full conformance with C++98 or later,
+ and for older GCC versions that are known to provide a compatible
+ libstdc++. */
+#if defined __cplusplus && (__cplusplus >= 199711L || __GNUC_PREREQ (4, 4))
# define __CORRECT_ISO_CPP_STRING_H_PROTO
#endif