From 37e6e5d2de9dda014e316e871e210f00202bb9f3 Mon Sep 17 00:00:00 2001
From: neroden <neroden@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun, 13 Jul 2003 06:52:25 +0000
Subject: [PATCH] * fixinc/inclhack.def (avoid_wchar_t_type): Use
__cplusplus bypass (for OpenBSD). * fixinc/fixincl.x: Rebuild.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@69284 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/ChangeLog | 6 ++++++
gcc/fixinc/fixincl.x | 6 +++---
gcc/fixinc/inclhack.def | 2 +-
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c3bc519e787..115776df8a6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-13 Nathanael Nerode <neroden@gcc.gnu.org>
+
+ * fixinc/inclhack.def (avoid_wchar_t_type): Use __cplusplus bypass
+ (for OpenBSD).
+ * fixinc/fixincl.x: Rebuild.
+
2003-07-12 Zack Weinberg <zack@codesourcery.com>
* configure.in: Always define HAVE_AS_GOTOFF_IN_DATA for
diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index b1b07041e7f..f76d6e781fb 100644
--- a/gcc/fixinc/fixincl.x
+++ b/gcc/fixinc/fixincl.x
@@ -2,11 +2,11 @@
*
* DO NOT EDIT THIS FILE (fixincl.x)
*
- * It has been AutoGen-ed Saturday July 12, 2003 at 03:37:51 PM EDT
+ * It has been AutoGen-ed Sunday July 13, 2003 at 02:48:14 AM EDT
* From the definitions inclhack.def
* and the template file fixincl
*/
-/* DO NOT CVS-MERGE THIS FILE, EITHER Sat Jul 12 15:37:51 EDT 2003
+/* DO NOT CVS-MERGE THIS FILE, EITHER Sun Jul 13 02:48:14 EDT 2003
*
* You must regenerate it. Use the ./genfixes script.
*
@@ -1007,7 +1007,7 @@ tSCC zAvoid_Wchar_T_TypeSelect0[] =
* content bypass pattern - skip fix if pattern found
*/
tSCC zAvoid_Wchar_T_TypeBypass0[] =
- "we must use the C\\+\\+ compiler's type";
+ "__cplusplus";
tSCC zAvoid_Wchar_T_TypeBypass1[] =
"_LINUX_NLS_H";
tSCC zAvoid_Wchar_T_TypeBypass2[] =
diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index 76df445a691..ae0ddcb82fa 100644
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -644,7 +644,7 @@ fix = {
hackname = avoid_wchar_t_type;
select = "^[ \t]*typedef[ \t].*[ \t]wchar_t[ \t]*;";
- bypass = "we must use the C\\+\\+ compiler's type";
+ bypass = "__cplusplus";
bypass = "_LINUX_NLS_H";
bypass = "XFree86: xc/lib/X11/Xlib\\.h";
--
GitLab