aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2006-02-02 09:38:03 +0000
committerRoland McGrath <roland@gnu.org>2006-02-02 09:38:03 +0000
commit30c14fdb7b289916af895bc1fb027e7f6534b370 (patch)
tree9e96be49f660a67a19c8408393dcc037a2d8e8c1
parent4d3f34be798550e6b154a98d400ccfecc6ec90f5 (diff)
downloadglibc-30c14fdb7b289916af895bc1fb027e7f6534b370.tar
glibc-30c14fdb7b289916af895bc1fb027e7f6534b370.tar.gz
glibc-30c14fdb7b289916af895bc1fb027e7f6534b370.tar.bz2
glibc-30c14fdb7b289916af895bc1fb027e7f6534b370.zip
* include/errno.h [__cplusplus]: Avoid extra header magic for C++.
-rw-r--r--ChangeLog2
-rw-r--r--include/errno.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fd1a8a69fd..9b113e5b0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2006-02-02 Roland McGrath <roland@redhat.com>
+ * include/errno.h [__cplusplus]: Avoid extra header magic for C++.
+
* manual/install.texi (Tools for Compilation): Require gcc 3.4,
recommend 4.1, advise 4.0 for powerpc64, and note 4.1 required for
powerpc, s390{x,} with new long double.
diff --git a/include/errno.h b/include/errno.h
index 9865903b86..fe8bca44c5 100644
--- a/include/errno.h
+++ b/include/errno.h
@@ -2,7 +2,7 @@
#include <stdlib/errno.h>
-#if defined _ERRNO_H && !defined _ISOMAC
+#if defined _ERRNO_H && !defined _ISOMAC && !defined __cplusplus
# ifdef IS_IN_rtld
# include <dl-sysdep.h>