diff options
author | John David Anglin <dave.anglin@nrc-cnrc.gc.ca> | 2010-09-07 14:47:21 +0000 |
---|---|---|
committer | John David Anglin <danglin@gcc.gnu.org> | 2010-09-07 14:47:21 +0000 |
commit | 9407158dbc9e46bed1308cb26f8abc77c5666055 (patch) | |
tree | 2baa48fde8047a31d93e60217fb4434749ae2661 /fixincludes | |
parent | b7c3f5eb21b9b4b4c6f6f16f8b24fe227a5782d4 (diff) | |
download | gcc-9407158dbc9e46bed1308cb26f8abc77c5666055.tar.gz |
inclhack.def (hpux_htonl): Allow trailing whitespace in select.
* inclhack.def (hpux_htonl): Allow trailing whitespace in select.
* fixincl.x: Regenerate.
From-SVN: r163953
Diffstat (limited to 'fixincludes')
-rw-r--r-- | fixincludes/ChangeLog | 5 | ||||
-rw-r--r-- | fixincludes/fixincl.x | 6 | ||||
-rw-r--r-- | fixincludes/inclhack.def | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog index 942df122fc4..60c76dd678d 100644 --- a/fixincludes/ChangeLog +++ b/fixincludes/ChangeLog @@ -1,3 +1,8 @@ +2010-09-07 John David Anglin <dave.anglin@nrc-cnrc.gc.ca> + + * inclhack.def (hpux_htonl): Allow trailing whitespace in select. + * fixincl.x: Regenerate. + 2010-07-12 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> * inclhack.def (solaris_cond_init): New fix. diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index f1552cc1741..dd493bb6254 100644 --- a/fixincludes/fixincl.x +++ b/fixincludes/fixincl.x @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (fixincl.x) * - * It has been AutoGen-ed Sunday June 27, 2010 at 12:52:26 PM MEST + * It has been AutoGen-ed Tuesday September 7, 2010 at 10:44:48 AM EDT * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Sun Jun 27 12:52:26 MEST 2010 +/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Sep 7 10:44:48 EDT 2010 * * You must regenerate it. Use the ./genfixes script. * @@ -3618,7 +3618,7 @@ tSCC zHpux_HtonlList[] = * content selection pattern - do fix if pattern found */ tSCC zHpux_HtonlSelect0[] = - "#ifndef _XOPEN_SOURCE_EXTENDED\n\ + "#ifndef _XOPEN_SOURCE_EXTENDED[ \t]*\n\ (/\\*\n\ \\* Macros for number representation conversion\\.\n\ \\*/\n\ diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def index 362dc7054c9..ef4f167b66a 100644 --- a/fixincludes/inclhack.def +++ b/fixincludes/inclhack.def @@ -1985,7 +1985,7 @@ fix = { fix = { hackname = hpux_htonl; files = netinet/in.h; - select = "#ifndef _XOPEN_SOURCE_EXTENDED\n" + select = "#ifndef _XOPEN_SOURCE_EXTENDED[ \t]*\n" "(/\\*\n" " \\* Macros for number representation conversion\\.\n" " \\*/\n" |