git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

inclhack.def (solaris_complex_cxx): Fix syntax. 

2011-05-17  Tristan Gingold  <gingold@adacore.com>

	* inclhack.def (solaris_complex_cxx): Fix syntax.
	* fixincl.x: Regenerate.

From-SVN: r173818
This commit is contained in:
Tristan Gingold 2011-05-17 08:00:15 +00:00 committed by Tristan Gingold
parent 8637e32a7e
commit f3450bc8d8
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fixincludes/ChangeLog
View File

@ -1,3 +1,8 @@
2011-05-17 Tristan Gingold <gingold@adacore.com>
* inclhack.def (solaris_complex_cxx): Fix syntax.
* fixincl.x: Regenerate.
2011-05-17 Tristan Gingold <gingold@adacore.com> 2011-05-17 Tristan Gingold <gingold@adacore.com>
* check.tpl: Shell-quote testing file. * check.tpl: Shell-quote testing file.

10
fixincludes/fixincl.x
View File

@ -2,11 +2,11 @@
* *
* DO NOT EDIT THIS FILE (fixincl.x) * DO NOT EDIT THIS FILE (fixincl.x)
* *
* It has been AutoGen-ed Monday November 8, 2010 at 08:33:47 PM MET * It has been AutoGen-ed May 16, 2011 at 02:55:35 PM by AutoGen 5.11.1
* From the definitions inclhack.def * From the definitions inclhack.def
* and the template file fixincl * and the template file fixincl
*/ */
/* DO NOT SVN-MERGE THIS FILE, EITHER Mon Nov 8 20:33:47 MET 2010 /* DO NOT SVN-MERGE THIS FILE, EITHER Mon May 16 14:55:35 CEST 2011
* *
* You must regenerate it. Use the ./genfixes script. * You must regenerate it. Use the ./genfixes script.
* *
@ -6256,10 +6256,12 @@ tSCC* apzSolaris_Complex_CxxMachs[] = {
* Fix Command Arguments for Solaris_Complex_Cxx * Fix Command Arguments for Solaris_Complex_Cxx
*/ */
static const char* apzSolaris_Complex_CxxPatch[] = { sed_cmd_z, static const char* apzSolaris_Complex_CxxPatch[] = { sed_cmd_z,
"-e", "/#if[ \t]*!defined(__cplusplus)/c#ifdef\t__cplusplus\\\n\ "-e", "/#if[ \t]*!defined(__cplusplus)/c\\\n\
#ifdef\t__cplusplus\\\n\
extern \"C\" {\\\n\ extern \"C\" {\\\n\
#endif", #endif",
"-e", "/#endif[ \t]*\\/\\* !defined(__cplusplus) \\*\\//c#ifdef\t__cplusplus\\\n\ "-e", "/#endif[ \t]*\\/\\* !defined(__cplusplus) \\*\\//c\\\n\
#ifdef\t__cplusplus\\\n\
}\\\n\ }\\\n\
#endif", #endif",
(char*)NULL }; (char*)NULL };

4
fixincludes/inclhack.def
View File

@ -3315,9 +3315,9 @@ fix = {
hackname = solaris_complex_cxx; hackname = solaris_complex_cxx;
mach = "*-*-solaris2.*"; mach = "*-*-solaris2.*";
files = complex.h; files = complex.h;
sed = "/#if[ \t]*!defined(__cplusplus)/c" sed = "/#if[ \t]*!defined(__cplusplus)/c\\\n"
"#ifdef\t__cplusplus\\\nextern \"C\" {\\\n#endif"; "#ifdef\t__cplusplus\\\nextern \"C\" {\\\n#endif";
sed = "/#endif[ \t]*\\/\\* !defined(__cplusplus) \\*\\//c" sed = "/#endif[ \t]*\\/\\* !defined(__cplusplus) \\*\\//c\\\n"
"#ifdef\t__cplusplus\\\n}\\\n#endif"; "#ifdef\t__cplusplus\\\n}\\\n#endif";
test_text = "#if !defined(__cplusplus)\n" test_text = "#if !defined(__cplusplus)\n"
"#endif /* !defined(__cplusplus) */"; "#endif /* !defined(__cplusplus) */";