inclhack.def (end_else_label): combined else_label and endif_label and fixed the sed expression.
*fixinc/inclhack.def(end_else_label): combined else_label
and endif_label and fixed the sed expression.
*fixinc/{fixincl.x|inclhack.sh}: regen
From-SVN: r27703
This commit is contained in:
Bruce Korb
Bruce Korb
parent
69f00f0151
commit
15b183364a
|
|
@ -1,3 +1,9 @@
|
|||
1999-06-22 Bruce Korb <ddsinc09@ix.netcom.com>
|
||||
|
||||
*fixinc/inclhack.def(end_else_label): combined else_label
|
||||
and endif_label and fixed the sed expression.
|
||||
*fixinc/{fixincl.x|inclhack.sh}: regen
|
||||
|
||||
Tue Jun 22 01:58:18 1999 Jeffrey A Law (law@cygnus.com)
|
||||
|
||||
* rs6000.md (movdf_hardfloat32): Use %X instead of always emitting
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
* files which are fixed to work correctly with ANSI C and placed in a
|
||||
* directory that GNU C will search.
|
||||
*
|
||||
* This file contains 105 fixup descriptions.
|
||||
* This file contains 104 fixup descriptions.
|
||||
*
|
||||
* See README-fixinc for more information.
|
||||
*
|
||||
|
|
@ -776,86 +776,49 @@ extern \"C\"\\\n\
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 21 - Else_Label fix
|
||||
* Description 21 - End_Else_Label fix
|
||||
*/
|
||||
tSCC zElse_LabelName[] =
|
||||
"Else_Label";
|
||||
tSCC zEnd_Else_LabelName[] =
|
||||
"End_Else_Label";
|
||||
/*
|
||||
* File name selection pattern
|
||||
*/
|
||||
#define zElse_LabelList (char*)NULL
|
||||
#define zEnd_Else_LabelList (char*)NULL
|
||||
/*
|
||||
* Machine/OS name selection pattern
|
||||
*/
|
||||
#define apzElse_LabelMachs (const char**)NULL
|
||||
#define apzEnd_Else_LabelMachs (const char**)NULL
|
||||
|
||||
/*
|
||||
* content selection pattern - do fix if pattern found
|
||||
*/
|
||||
tSCC zElse_LabelSelect0[] =
|
||||
"^[ \t]*#[ \t]*else[ \t]+[!-.0-~]";
|
||||
tSCC zEnd_Else_LabelSelect0[] =
|
||||
"^[ \t]*#[ \t]*(else|endif)[ \t]+([!-.0-z\\{\\|\\}\\~]|/[^\\*])";
|
||||
|
||||
#define ELSE_LABEL_TEST_CT 1
|
||||
#define ELSE_LABEL_RE_CT 1
|
||||
tTestDesc aElse_LabelTests[] = {
|
||||
{ TT_EGREP, zElse_LabelSelect0, (regex_t*)NULL }, };
|
||||
#define END_ELSE_LABEL_TEST_CT 1
|
||||
#define END_ELSE_LABEL_RE_CT 1
|
||||
tTestDesc aEnd_Else_LabelTests[] = {
|
||||
{ TT_EGREP, zEnd_Else_LabelSelect0, (regex_t*)NULL }, };
|
||||
|
||||
/*
|
||||
* Fix Command Arguments for Else_Label
|
||||
* Fix Command Arguments for End_Else_Label
|
||||
*/
|
||||
const char* apzElse_LabelPatch[] = { "sed",
|
||||
const char* apzEnd_Else_LabelPatch[] = { "sed",
|
||||
"-e", ":loop\n\
|
||||
/\\\\$/N\n\
|
||||
s/\\\\$/\\\\+++fixinc_eol+++/\n\
|
||||
/\\\\$/b loop\n\
|
||||
s/\\\\+++fixinc_eol+++/\\\\/g\n\
|
||||
s%^\\([ \t]*#[ \t]*else\\)[ \t]*/[^*].*%\\1%\n\
|
||||
s%^\\([ \t]*#[ \t]*else\\)[ \t]*[^/ \t].*%\\1%",
|
||||
s%^\\([ \t]*#[ \t]*else\\)[ \t][ \t]*/[^*].*%\\1%\n\
|
||||
s%^\\([ \t]*#[ \t]*else\\)[ \t][ \t]*[^/ \t].*%\\1%\n\
|
||||
s%^\\([ \t]*#[ \t]*endif\\)[ \t][ \t]*/[^*].*%\\1%\n\
|
||||
s%^\\([ \t]*#[ \t]*endif\\)[ \t][ \t]**[^/].*%\\1%\n\
|
||||
s%^\\([ \t]*#[ \t]*endif\\)[ \t][ \t]*[^/* \t].*%\\1%",
|
||||
(char*)NULL };
|
||||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 22 - Endif_Label fix
|
||||
*/
|
||||
tSCC zEndif_LabelName[] =
|
||||
"Endif_Label";
|
||||
/*
|
||||
* File name selection pattern
|
||||
*/
|
||||
#define zEndif_LabelList (char*)NULL
|
||||
/*
|
||||
* Machine/OS name selection pattern
|
||||
*/
|
||||
#define apzEndif_LabelMachs (const char**)NULL
|
||||
|
||||
/*
|
||||
* content selection pattern - do fix if pattern found
|
||||
*/
|
||||
tSCC zEndif_LabelSelect0[] =
|
||||
"^[ \t]*#[ \t]*endif[ \t]+[!-.0-z{|}~]|^[ \t]*#[ \t]*endif[ \t]+/[^*]";
|
||||
|
||||
#define ENDIF_LABEL_TEST_CT 1
|
||||
#define ENDIF_LABEL_RE_CT 1
|
||||
tTestDesc aEndif_LabelTests[] = {
|
||||
{ TT_EGREP, zEndif_LabelSelect0, (regex_t*)NULL }, };
|
||||
|
||||
/*
|
||||
* Fix Command Arguments for Endif_Label
|
||||
*/
|
||||
const char* apzEndif_LabelPatch[] = { "sed",
|
||||
"-e", ":loop\n\
|
||||
/\\\\$/N\n\
|
||||
s/\\\\$/\\\\+++fixinc_eol+++/\n\
|
||||
/\\\\$/b loop\n\
|
||||
s/\\\\+++fixinc_eol+++/\\\\/g\n\
|
||||
s%^\\([ \t]*#[ \t]*endif\\)[ \t]*/[^*].*%\\1%\n\
|
||||
s%^\\([ \t]*#[ \t]*endif\\)[ \t]*\\*[^/].*%\\1%\n\
|
||||
s%^\\([ \t]*#[ \t]*endif\\)[ \t]*[^/* \t].*%\\1%",
|
||||
(char*)NULL };
|
||||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 23 - Hp_Inline fix
|
||||
* Description 22 - Hp_Inline fix
|
||||
*/
|
||||
tSCC zHp_InlineName[] =
|
||||
"Hp_Inline";
|
||||
|
|
@ -890,7 +853,7 @@ const char* apzHp_InlinePatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 24 - Hp_Sysfile fix
|
||||
* Description 23 - Hp_Sysfile fix
|
||||
*/
|
||||
tSCC zHp_SysfileName[] =
|
||||
"Hp_Sysfile";
|
||||
|
|
@ -924,7 +887,7 @@ const char* apzHp_SysfilePatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 25 - Cxx_Unready fix
|
||||
* Description 24 - Cxx_Unready fix
|
||||
*/
|
||||
tSCC zCxx_UnreadyName[] =
|
||||
"Cxx_Unready";
|
||||
|
|
@ -966,7 +929,7 @@ extern \"C\" {\\\n\
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 26 - Hpux_Maxint fix
|
||||
* Description 25 - Hpux_Maxint fix
|
||||
*/
|
||||
tSCC zHpux_MaxintName[] =
|
||||
"Hpux_Maxint";
|
||||
|
|
@ -995,7 +958,7 @@ const char* apzHpux_MaxintPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 27 - Hpux_Systime fix
|
||||
* Description 26 - Hpux_Systime fix
|
||||
*/
|
||||
tSCC zHpux_SystimeName[] =
|
||||
"Hpux_Systime";
|
||||
|
|
@ -1029,7 +992,7 @@ const char* apzHpux_SystimePatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 28 - Interactv_Add1 fix
|
||||
* Description 27 - Interactv_Add1 fix
|
||||
*/
|
||||
tSCC zInteractv_Add1Name[] =
|
||||
"Interactv_Add1";
|
||||
|
|
@ -1066,7 +1029,7 @@ const char* apzInteractv_Add1Patch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 29 - Interactv_Add2 fix
|
||||
* Description 28 - Interactv_Add2 fix
|
||||
*/
|
||||
tSCC zInteractv_Add2Name[] =
|
||||
"Interactv_Add2";
|
||||
|
|
@ -1103,7 +1066,7 @@ const char* apzInteractv_Add2Patch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 30 - Interactv_Add3 fix
|
||||
* Description 29 - Interactv_Add3 fix
|
||||
*/
|
||||
tSCC zInteractv_Add3Name[] =
|
||||
"Interactv_Add3";
|
||||
|
|
@ -1141,7 +1104,7 @@ const char* apzInteractv_Add3Patch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 31 - Io_Def_Quotes fix
|
||||
* Description 30 - Io_Def_Quotes fix
|
||||
*/
|
||||
tSCC zIo_Def_QuotesName[] =
|
||||
"Io_Def_Quotes";
|
||||
|
|
@ -1177,7 +1140,7 @@ const char* apzIo_Def_QuotesPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 32 - Ioctl_Fix_Ctrl fix
|
||||
* Description 31 - Ioctl_Fix_Ctrl fix
|
||||
*/
|
||||
tSCC zIoctl_Fix_CtrlName[] =
|
||||
"Ioctl_Fix_Ctrl";
|
||||
|
|
@ -1215,7 +1178,7 @@ const char* apzIoctl_Fix_CtrlPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 33 - Ip_Missing_Semi fix
|
||||
* Description 32 - Ip_Missing_Semi fix
|
||||
*/
|
||||
tSCC zIp_Missing_SemiName[] =
|
||||
"Ip_Missing_Semi";
|
||||
|
|
@ -1241,7 +1204,7 @@ const char* apzIp_Missing_SemiPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 34 - Irix_Multiline_Cmnt fix
|
||||
* Description 33 - Irix_Multiline_Cmnt fix
|
||||
*/
|
||||
tSCC zIrix_Multiline_CmntName[] =
|
||||
"Irix_Multiline_Cmnt";
|
||||
|
|
@ -1268,7 +1231,7 @@ const char* apzIrix_Multiline_CmntPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 35 - Irix_Sockaddr fix
|
||||
* Description 34 - Irix_Sockaddr fix
|
||||
*/
|
||||
tSCC zIrix_SockaddrName[] =
|
||||
"Irix_Sockaddr";
|
||||
|
|
@ -1303,7 +1266,7 @@ struct sockaddr;\n",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 36 - Irix_Struct__File fix
|
||||
* Description 35 - Irix_Struct__File fix
|
||||
*/
|
||||
tSCC zIrix_Struct__FileName[] =
|
||||
"Irix_Struct__File";
|
||||
|
|
@ -1330,7 +1293,7 @@ struct __file_s;\n",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 37 - Isc_Fmod fix
|
||||
* Description 36 - Isc_Fmod fix
|
||||
*/
|
||||
tSCC zIsc_FmodName[] =
|
||||
"Isc_Fmod";
|
||||
|
|
@ -1364,7 +1327,7 @@ const char* apzIsc_FmodPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 38 - Motorola_Nested fix
|
||||
* Description 37 - Motorola_Nested fix
|
||||
*/
|
||||
tSCC zMotorola_NestedName[] =
|
||||
"Motorola_Nested";
|
||||
|
|
@ -1393,7 +1356,7 @@ const char* apzMotorola_NestedPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 39 - Isc_Sys_Limits fix
|
||||
* Description 38 - Isc_Sys_Limits fix
|
||||
*/
|
||||
tSCC zIsc_Sys_LimitsName[] =
|
||||
"Isc_Sys_Limits";
|
||||
|
|
@ -1428,7 +1391,7 @@ const char* apzIsc_Sys_LimitsPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 40 - Kandr_Concat fix
|
||||
* Description 39 - Kandr_Concat fix
|
||||
*/
|
||||
tSCC zKandr_ConcatName[] =
|
||||
"Kandr_Concat";
|
||||
|
|
@ -1462,7 +1425,7 @@ const char* apzKandr_ConcatPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 41 - Limits_Ifndefs fix
|
||||
* Description 40 - Limits_Ifndefs fix
|
||||
*/
|
||||
tSCC zLimits_IfndefsName[] =
|
||||
"Limits_Ifndefs";
|
||||
|
|
@ -1520,7 +1483,7 @@ const char* apzLimits_IfndefsPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 42 - Lynx_Void_Int fix
|
||||
* Description 41 - Lynx_Void_Int fix
|
||||
*/
|
||||
tSCC zLynx_Void_IntName[] =
|
||||
"Lynx_Void_Int";
|
||||
|
|
@ -1554,7 +1517,7 @@ const char* apzLynx_Void_IntPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 43 - Lynxos_Fcntl_Proto fix
|
||||
* Description 42 - Lynxos_Fcntl_Proto fix
|
||||
*/
|
||||
tSCC zLynxos_Fcntl_ProtoName[] =
|
||||
"Lynxos_Fcntl_Proto";
|
||||
|
|
@ -1588,7 +1551,7 @@ const char* apzLynxos_Fcntl_ProtoPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 44 - M88k_Bad_Hypot_Opt fix
|
||||
* Description 43 - M88k_Bad_Hypot_Opt fix
|
||||
*/
|
||||
tSCC zM88k_Bad_Hypot_OptName[] =
|
||||
"M88k_Bad_Hypot_Opt";
|
||||
|
|
@ -1629,7 +1592,7 @@ static __inline__ double fake_hypot (x, y)\\\n\
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 45 - M88k_Bad_S_If fix
|
||||
* Description 44 - M88k_Bad_S_If fix
|
||||
*/
|
||||
tSCC zM88k_Bad_S_IfName[] =
|
||||
"M88k_Bad_S_If";
|
||||
|
|
@ -1666,7 +1629,7 @@ const char* apzM88k_Bad_S_IfPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 46 - M88k_Multi_Incl fix
|
||||
* Description 45 - M88k_Multi_Incl fix
|
||||
*/
|
||||
tSCC zM88k_Multi_InclName[] =
|
||||
"M88k_Multi_Incl";
|
||||
|
|
@ -1707,7 +1670,7 @@ const char* apzM88k_Multi_InclPatch[] = { "sh", "-c",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 47 - Machine_Name fix
|
||||
* Description 46 - Machine_Name fix
|
||||
*/
|
||||
tSCC zMachine_NameName[] =
|
||||
"Machine_Name";
|
||||
|
|
@ -1776,7 +1739,7 @@ s/\\\\+++fixinc_eol+++/\\\\/g\n\
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 48 - Math_Exception fix
|
||||
* Description 47 - Math_Exception fix
|
||||
*/
|
||||
tSCC zMath_ExceptionName[] =
|
||||
"Math_Exception";
|
||||
|
|
@ -1825,7 +1788,7 @@ const char* apzMath_ExceptionPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 49 - Math_Gcc_Ifndefs fix
|
||||
* Description 48 - Math_Gcc_Ifndefs fix
|
||||
*/
|
||||
tSCC zMath_Gcc_IfndefsName[] =
|
||||
"Math_Gcc_Ifndefs";
|
||||
|
|
@ -1863,7 +1826,7 @@ const char* apzMath_Gcc_IfndefsPatch[] = { "sh", "-c",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 50 - Nested_Comment fix
|
||||
* Description 49 - Nested_Comment fix
|
||||
*/
|
||||
tSCC zNested_CommentName[] =
|
||||
"Nested_Comment";
|
||||
|
|
@ -1889,7 +1852,7 @@ const char* apzNested_CommentPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 51 - News_Os_Recursion fix
|
||||
* Description 50 - News_Os_Recursion fix
|
||||
*/
|
||||
tSCC zNews_Os_RecursionName[] =
|
||||
"News_Os_Recursion";
|
||||
|
|
@ -1926,7 +1889,7 @@ const char* apzNews_Os_RecursionPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 52 - Next_Math_Prefix fix
|
||||
* Description 51 - Next_Math_Prefix fix
|
||||
*/
|
||||
tSCC zNext_Math_PrefixName[] =
|
||||
"Next_Math_Prefix";
|
||||
|
|
@ -1964,7 +1927,7 @@ const char* apzNext_Math_PrefixPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 53 - Next_Template fix
|
||||
* Description 52 - Next_Template fix
|
||||
*/
|
||||
tSCC zNext_TemplateName[] =
|
||||
"Next_Template";
|
||||
|
|
@ -1999,7 +1962,7 @@ const char* apzNext_TemplatePatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 54 - Next_Volitile fix
|
||||
* Description 53 - Next_Volitile fix
|
||||
*/
|
||||
tSCC zNext_VolitileName[] =
|
||||
"Next_Volitile";
|
||||
|
|
@ -2034,7 +1997,7 @@ const char* apzNext_VolitilePatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 55 - Next_Wait_Union fix
|
||||
* Description 54 - Next_Wait_Union fix
|
||||
*/
|
||||
tSCC zNext_Wait_UnionName[] =
|
||||
"Next_Wait_Union";
|
||||
|
|
@ -2068,7 +2031,7 @@ const char* apzNext_Wait_UnionPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 56 - Nodeent_Syntax fix
|
||||
* Description 55 - Nodeent_Syntax fix
|
||||
*/
|
||||
tSCC zNodeent_SyntaxName[] =
|
||||
"Nodeent_Syntax";
|
||||
|
|
@ -2094,7 +2057,7 @@ const char* apzNodeent_SyntaxPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 57 - Osf_Namespace_A fix
|
||||
* Description 56 - Osf_Namespace_A fix
|
||||
*/
|
||||
tSCC zOsf_Namespace_AName[] =
|
||||
"Osf_Namespace_A";
|
||||
|
|
@ -2139,7 +2102,7 @@ const char* apzOsf_Namespace_APatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 58 - Osf_Namespace_B fix
|
||||
* Description 57 - Osf_Namespace_B fix
|
||||
*/
|
||||
tSCC zOsf_Namespace_BName[] =
|
||||
"Osf_Namespace_B";
|
||||
|
|
@ -2185,7 +2148,7 @@ typedef __regmatch_t\tregmatch_t;\n",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 59 - Pthread_Page_Size fix
|
||||
* Description 58 - Pthread_Page_Size fix
|
||||
*/
|
||||
tSCC zPthread_Page_SizeName[] =
|
||||
"Pthread_Page_Size";
|
||||
|
|
@ -2219,7 +2182,7 @@ const char* apzPthread_Page_SizePatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 60 - Rs6000_Double fix
|
||||
* Description 59 - Rs6000_Double fix
|
||||
*/
|
||||
tSCC zRs6000_DoubleName[] =
|
||||
"Rs6000_Double";
|
||||
|
|
@ -2256,7 +2219,7 @@ const char* apzRs6000_DoublePatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 61 - Rs6000_Fchmod fix
|
||||
* Description 60 - Rs6000_Fchmod fix
|
||||
*/
|
||||
tSCC zRs6000_FchmodName[] =
|
||||
"Rs6000_Fchmod";
|
||||
|
|
@ -2290,7 +2253,7 @@ const char* apzRs6000_FchmodPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 62 - Rs6000_Param fix
|
||||
* Description 61 - Rs6000_Param fix
|
||||
*/
|
||||
tSCC zRs6000_ParamName[] =
|
||||
"Rs6000_Param";
|
||||
|
|
@ -2316,7 +2279,7 @@ const char* apzRs6000_ParamPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 63 - Sony_Include fix
|
||||
* Description 62 - Sony_Include fix
|
||||
*/
|
||||
tSCC zSony_IncludeName[] =
|
||||
"Sony_Include";
|
||||
|
|
@ -2350,7 +2313,7 @@ const char* apzSony_IncludePatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 64 - Statsswtch fix
|
||||
* Description 63 - Statsswtch fix
|
||||
*/
|
||||
tSCC zStatsswtchName[] =
|
||||
"Statsswtch";
|
||||
|
|
@ -2384,7 +2347,7 @@ const char* apzStatsswtchPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 65 - Stdio_Va_List fix
|
||||
* Description 64 - Stdio_Va_List fix
|
||||
*/
|
||||
tSCC zStdio_Va_ListName[] =
|
||||
"Stdio_Va_List";
|
||||
|
|
@ -2427,7 +2390,7 @@ const char* apzStdio_Va_ListPatch[] = { "sh", "-c",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 66 - Sun_Bogus_Ifdef fix
|
||||
* Description 65 - Sun_Bogus_Ifdef fix
|
||||
*/
|
||||
tSCC zSun_Bogus_IfdefName[] =
|
||||
"Sun_Bogus_Ifdef";
|
||||
|
|
@ -2461,7 +2424,7 @@ const char* apzSun_Bogus_IfdefPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 67 - Sun_Bogus_Ifdef_Sun4c fix
|
||||
* Description 66 - Sun_Bogus_Ifdef_Sun4c fix
|
||||
*/
|
||||
tSCC zSun_Bogus_Ifdef_Sun4cName[] =
|
||||
"Sun_Bogus_Ifdef_Sun4c";
|
||||
|
|
@ -2495,7 +2458,7 @@ const char* apzSun_Bogus_Ifdef_Sun4cPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 68 - Sun_Catmacro fix
|
||||
* Description 67 - Sun_Catmacro fix
|
||||
*/
|
||||
tSCC zSun_CatmacroName[] =
|
||||
"Sun_Catmacro";
|
||||
|
|
@ -2534,7 +2497,7 @@ const char* apzSun_CatmacroPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 69 - Sun_Malloc fix
|
||||
* Description 68 - Sun_Malloc fix
|
||||
*/
|
||||
tSCC zSun_MallocName[] =
|
||||
"Sun_Malloc";
|
||||
|
|
@ -2563,7 +2526,7 @@ const char* apzSun_MallocPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 70 - Sun_Memcpy fix
|
||||
* Description 69 - Sun_Memcpy fix
|
||||
*/
|
||||
tSCC zSun_MemcpyName[] =
|
||||
"Sun_Memcpy";
|
||||
|
|
@ -2617,7 +2580,7 @@ extern int memcmp();\\\n\
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 71 - Sun_Rusers_Semi fix
|
||||
* Description 70 - Sun_Rusers_Semi fix
|
||||
*/
|
||||
tSCC zSun_Rusers_SemiName[] =
|
||||
"Sun_Rusers_Semi";
|
||||
|
|
@ -2651,7 +2614,7 @@ const char* apzSun_Rusers_SemiPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 72 - Sun_Signal fix
|
||||
* Description 71 - Sun_Signal fix
|
||||
*/
|
||||
tSCC zSun_SignalName[] =
|
||||
"Sun_Signal";
|
||||
|
|
@ -2690,7 +2653,7 @@ void\t(*signal(...))(...);\\\n\
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 73 - Sun_Auth_Proto fix
|
||||
* Description 72 - Sun_Auth_Proto fix
|
||||
*/
|
||||
tSCC zSun_Auth_ProtoName[] =
|
||||
"Sun_Auth_Proto";
|
||||
|
|
@ -2729,7 +2692,7 @@ const char* apzSun_Auth_ProtoPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 74 - Sunos_Matherr_Decl fix
|
||||
* Description 73 - Sunos_Matherr_Decl fix
|
||||
*/
|
||||
tSCC zSunos_Matherr_DeclName[] =
|
||||
"Sunos_Matherr_Decl";
|
||||
|
|
@ -2757,7 +2720,7 @@ struct exception;\n",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 75 - Sunos_Strlen fix
|
||||
* Description 74 - Sunos_Strlen fix
|
||||
*/
|
||||
tSCC zSunos_StrlenName[] =
|
||||
"Sunos_Strlen";
|
||||
|
|
@ -2783,7 +2746,7 @@ const char* apzSunos_StrlenPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 76 - Systypes fix
|
||||
* Description 75 - Systypes fix
|
||||
*/
|
||||
tSCC zSystypesName[] =
|
||||
"Systypes";
|
||||
|
|
@ -2841,7 +2804,7 @@ typedef __SIZE_TYPE__ size_t;\\\n\
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 77 - Systypes_For_Aix fix
|
||||
* Description 76 - Systypes_For_Aix fix
|
||||
*/
|
||||
tSCC zSystypes_For_AixName[] =
|
||||
"Systypes_For_Aix";
|
||||
|
|
@ -2886,7 +2849,7 @@ const char* apzSystypes_For_AixPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 78 - Sysv68_String fix
|
||||
* Description 77 - Sysv68_String fix
|
||||
*/
|
||||
tSCC zSysv68_StringName[] =
|
||||
"Sysv68_String";
|
||||
|
|
@ -2922,7 +2885,7 @@ extern unsigned int\\\n\
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 79 - Sysz_Stdlib_For_Sun fix
|
||||
* Description 78 - Sysz_Stdlib_For_Sun fix
|
||||
*/
|
||||
tSCC zSysz_Stdlib_For_SunName[] =
|
||||
"Sysz_Stdlib_For_Sun";
|
||||
|
|
@ -2958,7 +2921,7 @@ const char* apzSysz_Stdlib_For_SunPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 80 - Sysz_Stdtypes_For_Sun fix
|
||||
* Description 79 - Sysz_Stdtypes_For_Sun fix
|
||||
*/
|
||||
tSCC zSysz_Stdtypes_For_SunName[] =
|
||||
"Sysz_Stdtypes_For_Sun";
|
||||
|
|
@ -2998,7 +2961,7 @@ const char* apzSysz_Stdtypes_For_SunPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 81 - Tinfo_Cplusplus fix
|
||||
* Description 80 - Tinfo_Cplusplus fix
|
||||
*/
|
||||
tSCC zTinfo_CplusplusName[] =
|
||||
"Tinfo_Cplusplus";
|
||||
|
|
@ -3024,7 +2987,7 @@ const char* apzTinfo_CplusplusPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 82 - Ultrix_Ansi_Compat fix
|
||||
* Description 81 - Ultrix_Ansi_Compat fix
|
||||
*/
|
||||
tSCC zUltrix_Ansi_CompatName[] =
|
||||
"Ultrix_Ansi_Compat";
|
||||
|
|
@ -3060,7 +3023,7 @@ const char* apzUltrix_Ansi_CompatPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 83 - Ultrix_Fix_Fixproto fix
|
||||
* Description 82 - Ultrix_Fix_Fixproto fix
|
||||
*/
|
||||
tSCC zUltrix_Fix_FixprotoName[] =
|
||||
"Ultrix_Fix_Fixproto";
|
||||
|
|
@ -3095,7 +3058,7 @@ struct utsname;\n",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 84 - Ultrix_Atof_Param fix
|
||||
* Description 83 - Ultrix_Atof_Param fix
|
||||
*/
|
||||
tSCC zUltrix_Atof_ParamName[] =
|
||||
"Ultrix_Atof_Param";
|
||||
|
|
@ -3125,7 +3088,7 @@ const char* apzUltrix_Atof_ParamPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 85 - Ultrix_Const fix
|
||||
* Description 84 - Ultrix_Const fix
|
||||
*/
|
||||
tSCC zUltrix_ConstName[] =
|
||||
"Ultrix_Const";
|
||||
|
|
@ -3159,7 +3122,7 @@ const char* apzUltrix_ConstPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 86 - Ultrix_Ifdef fix
|
||||
* Description 85 - Ultrix_Ifdef fix
|
||||
*/
|
||||
tSCC zUltrix_IfdefName[] =
|
||||
"Ultrix_Ifdef";
|
||||
|
|
@ -3193,7 +3156,7 @@ const char* apzUltrix_IfdefPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 87 - Ultrix_Nested_Cmnt fix
|
||||
* Description 86 - Ultrix_Nested_Cmnt fix
|
||||
*/
|
||||
tSCC zUltrix_Nested_CmntName[] =
|
||||
"Ultrix_Nested_Cmnt";
|
||||
|
|
@ -3219,7 +3182,7 @@ const char* apzUltrix_Nested_CmntPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 88 - Ultrix_Static fix
|
||||
* Description 87 - Ultrix_Static fix
|
||||
*/
|
||||
tSCC zUltrix_StaticName[] =
|
||||
"Ultrix_Static";
|
||||
|
|
@ -3255,7 +3218,7 @@ const char* apzUltrix_StaticPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 89 - Undefine_Null fix
|
||||
* Description 88 - Undefine_Null fix
|
||||
*/
|
||||
tSCC zUndefine_NullName[] =
|
||||
"Undefine_Null";
|
||||
|
|
@ -3296,7 +3259,7 @@ const char* apzUndefine_NullPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 90 - Va_I960_Macro fix
|
||||
* Description 89 - Va_I960_Macro fix
|
||||
*/
|
||||
tSCC zVa_I960_MacroName[] =
|
||||
"Va_I960_Macro";
|
||||
|
|
@ -3333,7 +3296,7 @@ const char* apzVa_I960_MacroPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 91 - Void_Null fix
|
||||
* Description 90 - Void_Null fix
|
||||
*/
|
||||
tSCC zVoid_NullName[] =
|
||||
"Void_Null";
|
||||
|
|
@ -3367,7 +3330,7 @@ const char* apzVoid_NullPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 92 - Vxworks_Gcc_Problem fix
|
||||
* Description 91 - Vxworks_Gcc_Problem fix
|
||||
*/
|
||||
tSCC zVxworks_Gcc_ProblemName[] =
|
||||
"Vxworks_Gcc_Problem";
|
||||
|
|
@ -3416,7 +3379,7 @@ const char* apzVxworks_Gcc_ProblemPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 93 - Vxworks_Needs_Vxtypes fix
|
||||
* Description 92 - Vxworks_Needs_Vxtypes fix
|
||||
*/
|
||||
tSCC zVxworks_Needs_VxtypesName[] =
|
||||
"Vxworks_Needs_Vxtypes";
|
||||
|
|
@ -3450,7 +3413,7 @@ const char* apzVxworks_Needs_VxtypesPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 94 - Vxworks_Needs_Vxworks fix
|
||||
* Description 93 - Vxworks_Needs_Vxworks fix
|
||||
*/
|
||||
tSCC zVxworks_Needs_VxworksName[] =
|
||||
"Vxworks_Needs_Vxworks";
|
||||
|
|
@ -3498,7 +3461,7 @@ const char* apzVxworks_Needs_VxworksPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 95 - Vxworks_Time fix
|
||||
* Description 94 - Vxworks_Time fix
|
||||
*/
|
||||
tSCC zVxworks_TimeName[] =
|
||||
"Vxworks_Time";
|
||||
|
|
@ -3548,7 +3511,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\\\n\
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 96 - X11_Class fix
|
||||
* Description 95 - X11_Class fix
|
||||
*/
|
||||
tSCC zX11_ClassName[] =
|
||||
"X11_Class";
|
||||
|
|
@ -3587,7 +3550,7 @@ const char* apzX11_ClassPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 97 - X11_Class_Usage fix
|
||||
* Description 96 - X11_Class_Usage fix
|
||||
*/
|
||||
tSCC zX11_Class_UsageName[] =
|
||||
"X11_Class_Usage";
|
||||
|
|
@ -3621,7 +3584,7 @@ const char* apzX11_Class_UsagePatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 98 - X11_New fix
|
||||
* Description 97 - X11_New fix
|
||||
*/
|
||||
tSCC zX11_NewName[] =
|
||||
"X11_New";
|
||||
|
|
@ -3661,7 +3624,7 @@ const char* apzX11_NewPatch[] = { "sed",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 99 - X11_Sprintf fix
|
||||
* Description 98 - X11_Sprintf fix
|
||||
*/
|
||||
tSCC zX11_SprintfName[] =
|
||||
"X11_Sprintf";
|
||||
|
|
@ -3689,7 +3652,7 @@ extern char *\tsprintf();\\\n\
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 100 - Zzz_Ki_Iface fix
|
||||
* Description 99 - Zzz_Ki_Iface fix
|
||||
*/
|
||||
tSCC zZzz_Ki_IfaceName[] =
|
||||
"Zzz_Ki_Iface";
|
||||
|
|
@ -3725,7 +3688,7 @@ cat > /dev/null",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 101 - Zzz_Ki fix
|
||||
* Description 100 - Zzz_Ki fix
|
||||
*/
|
||||
tSCC zZzz_KiName[] =
|
||||
"Zzz_Ki";
|
||||
|
|
@ -3761,7 +3724,7 @@ cat > /dev/null",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 102 - Zzz_Ki_Calls fix
|
||||
* Description 101 - Zzz_Ki_Calls fix
|
||||
*/
|
||||
tSCC zZzz_Ki_CallsName[] =
|
||||
"Zzz_Ki_Calls";
|
||||
|
|
@ -3797,7 +3760,7 @@ cat > /dev/null",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 103 - Zzz_Ki_Defs fix
|
||||
* Description 102 - Zzz_Ki_Defs fix
|
||||
*/
|
||||
tSCC zZzz_Ki_DefsName[] =
|
||||
"Zzz_Ki_Defs";
|
||||
|
|
@ -3833,7 +3796,7 @@ cat > /dev/null",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 104 - Zzz_Bad_Fixes fix
|
||||
* Description 103 - Zzz_Bad_Fixes fix
|
||||
*/
|
||||
tSCC zZzz_Bad_FixesName[] =
|
||||
"Zzz_Bad_Fixes";
|
||||
|
|
@ -3861,7 +3824,7 @@ cat > /dev/null",
|
|||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description 105 - Zzz_Time fix
|
||||
* Description 104 - Zzz_Time fix
|
||||
*/
|
||||
tSCC zZzz_TimeName[] =
|
||||
"Zzz_Time";
|
||||
|
|
@ -3899,8 +3862,8 @@ cat > /dev/null",
|
|||
*
|
||||
* List of all fixes
|
||||
*/
|
||||
#define REGEX_COUNT 74
|
||||
#define FIX_COUNT 105
|
||||
#define REGEX_COUNT 73
|
||||
#define FIX_COUNT 104
|
||||
tFixDesc fixDescList[ FIX_COUNT ] = {
|
||||
{ zAix_SyswaitName, zAix_SyswaitList,
|
||||
apzAix_SyswaitMachs, (regex_t*)NULL,
|
||||
|
|
@ -4002,15 +3965,10 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
|
|||
SCO5_STAT_WRAPPERS_TEST_CT, FD_MACH_ONLY,
|
||||
aSco5_Stat_WrappersTests, apzSco5_Stat_WrappersPatch },
|
||||
|
||||
{ zElse_LabelName, zElse_LabelList,
|
||||
apzElse_LabelMachs, (regex_t*)NULL,
|
||||
ELSE_LABEL_TEST_CT, FD_MACH_ONLY,
|
||||
aElse_LabelTests, apzElse_LabelPatch },
|
||||
|
||||
{ zEndif_LabelName, zEndif_LabelList,
|
||||
apzEndif_LabelMachs, (regex_t*)NULL,
|
||||
ENDIF_LABEL_TEST_CT, FD_MACH_ONLY,
|
||||
aEndif_LabelTests, apzEndif_LabelPatch },
|
||||
{ zEnd_Else_LabelName, zEnd_Else_LabelList,
|
||||
apzEnd_Else_LabelMachs, (regex_t*)NULL,
|
||||
END_ELSE_LABEL_TEST_CT, FD_MACH_ONLY,
|
||||
aEnd_Else_LabelTests, apzEnd_Else_LabelPatch },
|
||||
|
||||
{ zHp_InlineName, zHp_InlineList,
|
||||
apzHp_InlineMachs, (regex_t*)NULL,
|
||||
|
|
|
|||
|
|
@ -416,31 +416,13 @@ fix = {
|
|||
|
||||
|
||||
/*
|
||||
* Fix else directives that contain non-commentary text
|
||||
*
|
||||
* The fixinc_eol stuff is to work around a bug in the sed
|
||||
* Fix else and endif directives that contain non-commentary text
|
||||
*/
|
||||
fix = {
|
||||
hackname = else_label;
|
||||
select = "^[ \t]*#[ \t]*else[ \t]+[!-.0-~]";
|
||||
sed = ":loop\n"
|
||||
'/\\\\$/' "N\n"
|
||||
's/\\\\$/\\\\+++fixinc_eol+++/' "\n"
|
||||
'/\\\\$/' "b loop\n"
|
||||
's/\\\\+++fixinc_eol+++/\\\\/g' "\n"
|
||||
hackname = end_else_label;
|
||||
|
||||
"s%^\\([ \t]*#[ \t]*else\\)[ \t]*/[^*].*%\\1%\n"
|
||||
"s%^\\([ \t]*#[ \t]*else\\)[ \t]*[^/ \t].*%\\1%";
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* Fix endif directives that contain non-commentary text
|
||||
*/
|
||||
fix = {
|
||||
hackname = endif_label;
|
||||
/*
|
||||
* Select files that contain '#endif' directives with
|
||||
* Select files that contain '#endif' or '#else' directives with
|
||||
* some sort of following junk. (Between the ascii '.'
|
||||
* and '0' lies the character '/'. This will *NOT*
|
||||
* match '#endif / * foo * /', but it also wont match
|
||||
|
|
@ -452,13 +434,14 @@ fix = {
|
|||
* "#endif /% blah %/ which appear on OSF4.0A and AIX4.2
|
||||
* repsectively.
|
||||
*
|
||||
* We use the pattern [!-.0-z{|}~] instead of [^/ \t] to match a noncomment
|
||||
* following #else or #endif because some buggy egreps think [^/] matches
|
||||
* newline, and they thus think `#else ' matches
|
||||
* We use the pattern [!-.0-z{|}~] instead of [^/ \t] to match a
|
||||
* noncomment following #else or #endif because some buggy egreps
|
||||
* think [^/] matches newline, and they thus think `#else ' matches
|
||||
* `#e[ndiflse]*[ \t]+[^/ \t]'.
|
||||
* [!-.0-~] does not work properly on AIX 4.1.
|
||||
*/
|
||||
select = "^[ \t]*#[ \t]*endif[ \t]+[!-.0-z\{\|\}\~]|^[ \t]*#[ \t]*endif[ \t]+/[^\*]";
|
||||
select = "^[ \t]*#[ \t]*(else|endif)[ \t]+"
|
||||
"(" '[!-.0-z\{\|\}\~]' "|" '/[^\*]' ")";
|
||||
|
||||
/*
|
||||
* First, join the continued input lines.
|
||||
|
|
@ -476,9 +459,11 @@ fix = {
|
|||
'/\\\\$/' "b loop\n"
|
||||
's/\\\\+++fixinc_eol+++/\\\\/g' "\n"
|
||||
|
||||
"s%^\\([ \t]*#[ \t]*endif\\)[ \t]*/[^*].*%\\1%\n"
|
||||
"s%^\\([ \t]*#[ \t]*endif\\)[ \t]*\\*[^/].*%\\1%\n"
|
||||
"s%^\\([ \t]*#[ \t]*endif\\)[ \t]*[^/* \t].*%\\1%";
|
||||
"s%^\\([ \t]*#[ \t]*else\\)[ \t][ \t]*/[^*].*%\\1%\n"
|
||||
"s%^\\([ \t]*#[ \t]*else\\)[ \t][ \t]*[^/ \t].*%\\1%\n"
|
||||
"s%^\\([ \t]*#[ \t]*endif\\)[ \t][ \t]*/[^*].*%\\1%\n"
|
||||
"s%^\\([ \t]*#[ \t]*endif\\)[ \t][ \t]*\*[^/].*%\\1%\n"
|
||||
"s%^\\([ \t]*#[ \t]*endif\\)[ \t][ \t]*[^/* \t].*%\\1%";
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
# files which are fixed to work correctly with ANSI C and placed in a
|
||||
# directory that GNU C will search.
|
||||
#
|
||||
# This script contains 105 fixup scripts.
|
||||
# This script contains 104 fixup scripts.
|
||||
#
|
||||
# See README-fixinc for more information.
|
||||
#
|
||||
|
|
@ -848,7 +848,8 @@ _EOF_
|
|||
< $infile > ${DESTDIR}/fixinc.tmp
|
||||
rm -f ${DESTFILE}
|
||||
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
|
||||
fi # if test
|
||||
fi # end of selection 'if'
|
||||
|
||||
|
||||
#
|
||||
# Fix 19: Ecd_Cursor
|
||||
|
|
@ -901,12 +902,12 @@ extern "C"\
|
|||
|
||||
|
||||
#
|
||||
# Fix 21: Else_Label
|
||||
# Fix 21: End_Else_Label
|
||||
#
|
||||
if ( test -n "`egrep '^[ ]*#[ ]*else[ ]+[!-.0-~]' ${file}`"
|
||||
if ( test -n "`egrep '^[ ]*#[ ]*(else|endif)[ ]+([!-.0-z\\{\\|\\}\\~]|/[^\\*])' ${file}`"
|
||||
) > /dev/null 2>&1 ; then
|
||||
fixlist="${fixlist}
|
||||
else_label"
|
||||
end_else_label"
|
||||
if [ ! -r ${DESTFILE} ]
|
||||
then infile=${file}
|
||||
else infile=${DESTFILE} ; fi
|
||||
|
|
@ -916,8 +917,11 @@ extern "C"\
|
|||
s/\\$/\\+++fixinc_eol+++/
|
||||
/\\$/b loop
|
||||
s/\\+++fixinc_eol+++/\\/g
|
||||
s%^\([ ]*#[ ]*else\)[ ]*/[^*].*%\1%
|
||||
s%^\([ ]*#[ ]*else\)[ ]*[^/ ].*%\1%' \
|
||||
s%^\([ ]*#[ ]*else\)[ ][ ]*/[^*].*%\1%
|
||||
s%^\([ ]*#[ ]*else\)[ ][ ]*[^/ ].*%\1%
|
||||
s%^\([ ]*#[ ]*endif\)[ ][ ]*/[^*].*%\1%
|
||||
s%^\([ ]*#[ ]*endif\)[ ][ ]**[^/].*%\1%
|
||||
s%^\([ ]*#[ ]*endif\)[ ][ ]*[^/* ].*%\1%' \
|
||||
< $infile > ${DESTDIR}/fixinc.tmp
|
||||
rm -f ${DESTFILE}
|
||||
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
|
||||
|
|
@ -925,32 +929,7 @@ s%^\([ ]*#[ ]*else\)[ ]*[^/ ].*%\1%' \
|
|||
|
||||
|
||||
#
|
||||
# Fix 22: Endif_Label
|
||||
#
|
||||
if ( test -n "`egrep '^[ ]*#[ ]*endif[ ]+[!-.0-z{|}~]|^[ ]*#[ ]*endif[ ]+/[^*]' ${file}`"
|
||||
) > /dev/null 2>&1 ; then
|
||||
fixlist="${fixlist}
|
||||
endif_label"
|
||||
if [ ! -r ${DESTFILE} ]
|
||||
then infile=${file}
|
||||
else infile=${DESTFILE} ; fi
|
||||
|
||||
sed -e ':loop
|
||||
/\\$/N
|
||||
s/\\$/\\+++fixinc_eol+++/
|
||||
/\\$/b loop
|
||||
s/\\+++fixinc_eol+++/\\/g
|
||||
s%^\([ ]*#[ ]*endif\)[ ]*/[^*].*%\1%
|
||||
s%^\([ ]*#[ ]*endif\)[ ]*\*[^/].*%\1%
|
||||
s%^\([ ]*#[ ]*endif\)[ ]*[^/* ].*%\1%' \
|
||||
< $infile > ${DESTDIR}/fixinc.tmp
|
||||
rm -f ${DESTFILE}
|
||||
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
|
||||
fi # end of selection 'if'
|
||||
|
||||
|
||||
#
|
||||
# Fix 23: Hp_Inline
|
||||
# Fix 22: Hp_Inline
|
||||
#
|
||||
case "${file}" in ./sys/spinlock.h )
|
||||
if ( test -n "`egrep 'include.*\"\\.\\./machine/' ${file}`"
|
||||
|
|
@ -972,7 +951,7 @@ s%^\([ ]*#[ ]*endif\)[ ]*[^/* ].*%\1%' \
|
|||
|
||||
|
||||
#
|
||||
# Fix 24: Hp_Sysfile
|
||||
# Fix 23: Hp_Sysfile
|
||||
#
|
||||
case "${file}" in ./sys/file.h )
|
||||
if ( test -n "`egrep 'HPUX_SOURCE' ${file}`"
|
||||
|
|
@ -993,7 +972,7 @@ s%^\([ ]*#[ ]*endif\)[ ]*[^/* ].*%\1%' \
|
|||
|
||||
|
||||
#
|
||||
# Fix 25: Cxx_Unready
|
||||
# Fix 24: Cxx_Unready
|
||||
#
|
||||
case "${file}" in ./sys/mman.h | \
|
||||
./rpc/types.h )
|
||||
|
|
@ -1025,7 +1004,7 @@ extern "C" {\
|
|||
|
||||
|
||||
#
|
||||
# Fix 26: Hpux_Maxint
|
||||
# Fix 25: Hpux_Maxint
|
||||
#
|
||||
case "${file}" in ./sys/param.h )
|
||||
fixlist="${fixlist}
|
||||
|
|
@ -1048,7 +1027,7 @@ extern "C" {\
|
|||
|
||||
|
||||
#
|
||||
# Fix 27: Hpux_Systime
|
||||
# Fix 26: Hpux_Systime
|
||||
#
|
||||
case "${file}" in ./sys/time.h )
|
||||
if ( test -n "`egrep '^extern struct sigevent;' ${file}`"
|
||||
|
|
@ -1069,7 +1048,7 @@ extern "C" {\
|
|||
|
||||
|
||||
#
|
||||
# Fix 28: Interactv_Add1
|
||||
# Fix 27: Interactv_Add1
|
||||
#
|
||||
case "${file}" in ./stdio.h | \
|
||||
./math.h | \
|
||||
|
|
@ -1096,7 +1075,7 @@ extern "C" {\
|
|||
|
||||
|
||||
#
|
||||
# Fix 29: Interactv_Add2
|
||||
# Fix 28: Interactv_Add2
|
||||
#
|
||||
case "${file}" in ./math.h )
|
||||
if ( test '(' -d /etc/conf/kconfig.d ')' -a \
|
||||
|
|
@ -1118,7 +1097,7 @@ extern "C" {\
|
|||
|
||||
|
||||
#
|
||||
# Fix 30: Interactv_Add3
|
||||
# Fix 29: Interactv_Add3
|
||||
#
|
||||
case "${file}" in ./sys/limits.h )
|
||||
if ( test '(' -d /etc/conf/kconfig.d ')' -a \
|
||||
|
|
@ -1141,7 +1120,7 @@ extern "C" {\
|
|||
|
||||
|
||||
#
|
||||
# Fix 31: Io_Def_Quotes
|
||||
# Fix 30: Io_Def_Quotes
|
||||
#
|
||||
if ( test -n "`egrep '[ ]*[ ](_|DES)IO[A-Z]*[ ]*\\( *[^,'\\'']' ${file}`"
|
||||
) > /dev/null 2>&1 ; then
|
||||
|
|
@ -1162,7 +1141,7 @@ extern "C" {\
|
|||
|
||||
|
||||
#
|
||||
# Fix 32: Ioctl_Fix_Ctrl
|
||||
# Fix 31: Ioctl_Fix_Ctrl
|
||||
#
|
||||
if ( test -n "`egrep 'CTRL[ ]*\\(' ${file}`"
|
||||
) > /dev/null 2>&1 ; then
|
||||
|
|
@ -1185,7 +1164,7 @@ extern "C" {\
|
|||
|
||||
|
||||
#
|
||||
# Fix 33: Ip_Missing_Semi
|
||||
# Fix 32: Ip_Missing_Semi
|
||||
#
|
||||
case "${file}" in ./netinet/ip.h )
|
||||
fixlist="${fixlist}
|
||||
|
|
@ -1203,7 +1182,7 @@ extern "C" {\
|
|||
|
||||
|
||||
#
|
||||
# Fix 34: Irix_Multiline_Cmnt
|
||||
# Fix 33: Irix_Multiline_Cmnt
|
||||
#
|
||||
case "${file}" in ./sys/types.h )
|
||||
fixlist="${fixlist}
|
||||
|
|
@ -1222,7 +1201,7 @@ extern "C" {\
|
|||
|
||||
|
||||
#
|
||||
# Fix 35: Irix_Sockaddr
|
||||
# Fix 34: Irix_Sockaddr
|
||||
#
|
||||
case "${file}" in ./rpc/auth.h )
|
||||
if ( test -n "`egrep 'authdes_create.*struct sockaddr' ${file}`"
|
||||
|
|
@ -1245,7 +1224,7 @@ struct sockaddr;
|
|||
|
||||
|
||||
#
|
||||
# Fix 36: Irix_Struct__File
|
||||
# Fix 35: Irix_Struct__File
|
||||
#
|
||||
case "${file}" in ./rpc/xdr.h )
|
||||
fixlist="${fixlist}
|
||||
|
|
@ -1265,7 +1244,7 @@ struct __file_s;
|
|||
|
||||
|
||||
#
|
||||
# Fix 37: Isc_Fmod
|
||||
# Fix 36: Isc_Fmod
|
||||
#
|
||||
case "${file}" in ./math.h )
|
||||
if ( test -n "`egrep 'fmod\\(double\\)' ${file}`"
|
||||
|
|
@ -1286,7 +1265,7 @@ struct __file_s;
|
|||
|
||||
|
||||
#
|
||||
# Fix 38: Motorola_Nested
|
||||
# Fix 37: Motorola_Nested
|
||||
#
|
||||
case "${file}" in ./limits.h | \
|
||||
./sys/limits.h )
|
||||
|
|
@ -1309,7 +1288,7 @@ struct __file_s;
|
|||
|
||||
|
||||
#
|
||||
# Fix 39: Isc_Sys_Limits
|
||||
# Fix 38: Isc_Sys_Limits
|
||||
#
|
||||
case "${file}" in ./sys/limits.h )
|
||||
if ( test -n "`egrep 'CHILD_MAX' ${file}`"
|
||||
|
|
@ -1331,7 +1310,7 @@ struct __file_s;
|
|||
|
||||
|
||||
#
|
||||
# Fix 40: Kandr_Concat
|
||||
# Fix 39: Kandr_Concat
|
||||
#
|
||||
case "${file}" in ./sparc/asm_linkage.h | \
|
||||
./sun3/asm_linkage.h | \
|
||||
|
|
@ -1369,7 +1348,7 @@ struct __file_s;
|
|||
|
||||
|
||||
#
|
||||
# Fix 41: Limits_Ifndefs
|
||||
# Fix 40: Limits_Ifndefs
|
||||
#
|
||||
case "${file}" in ./limits.h | \
|
||||
./sys/limits.h )
|
||||
|
|
@ -1427,7 +1406,7 @@ struct __file_s;
|
|||
|
||||
|
||||
#
|
||||
# Fix 42: Lynx_Void_Int
|
||||
# Fix 41: Lynx_Void_Int
|
||||
#
|
||||
case "${file}" in ./curses.h )
|
||||
if ( test -n "`egrep '#[ ]*define[ ]+void[ ]+int' ${file}`"
|
||||
|
|
@ -1448,7 +1427,7 @@ struct __file_s;
|
|||
|
||||
|
||||
#
|
||||
# Fix 43: Lynxos_Fcntl_Proto
|
||||
# Fix 42: Lynxos_Fcntl_Proto
|
||||
#
|
||||
case "${file}" in ./fcntl.h )
|
||||
if ( test -n "`egrep 'fcntl.*\\(int, int, int\\)' ${file}`"
|
||||
|
|
@ -1469,7 +1448,7 @@ struct __file_s;
|
|||
|
||||
|
||||
#
|
||||
# Fix 44: M88k_Bad_Hypot_Opt
|
||||
# Fix 43: M88k_Bad_Hypot_Opt
|
||||
#
|
||||
case "${file}" in ./math.h )
|
||||
case "$target_canonical" in m88k-motorola-sysv3* )
|
||||
|
|
@ -1504,7 +1483,7 @@ static __inline__ double fake_hypot (x, y)\
|
|||
|
||||
|
||||
#
|
||||
# Fix 45: M88k_Bad_S_If
|
||||
# Fix 44: M88k_Bad_S_If
|
||||
#
|
||||
case "${file}" in ./sys/stat.h )
|
||||
case "$target_canonical" in m88k-*-sysv3* )
|
||||
|
|
@ -1529,7 +1508,7 @@ static __inline__ double fake_hypot (x, y)\
|
|||
|
||||
|
||||
#
|
||||
# Fix 46: M88k_Multi_Incl
|
||||
# Fix 45: M88k_Multi_Incl
|
||||
#
|
||||
case "${file}" in ./time.h )
|
||||
case "$target_canonical" in m88k-tektronix-sysv3* )
|
||||
|
|
@ -1562,7 +1541,7 @@ static __inline__ double fake_hypot (x, y)\
|
|||
|
||||
|
||||
#
|
||||
# Fix 47: Machine_Name
|
||||
# Fix 46: Machine_Name
|
||||
#
|
||||
if ( test -n "`egrep '^#[ ]*(if|elif).*[^a-zA-Z0-9_](_*[MSRrhim]|[Mbimnpstuv])[a-zA-Z0-9_]' ${file}`"
|
||||
) > /dev/null 2>&1 ; then
|
||||
|
|
@ -1614,7 +1593,7 @@ s/\\+++fixinc_eol+++/\\/g
|
|||
|
||||
|
||||
#
|
||||
# Fix 48: Math_Exception
|
||||
# Fix 47: Math_Exception
|
||||
#
|
||||
case "${file}" in ./math.h )
|
||||
if ( test -n "`egrep 'struct exception' ${file}`"
|
||||
|
|
@ -1654,7 +1633,7 @@ s/\\+++fixinc_eol+++/\\/g
|
|||
|
||||
|
||||
#
|
||||
# Fix 49: Math_Gcc_Ifndefs
|
||||
# Fix 48: Math_Gcc_Ifndefs
|
||||
#
|
||||
case "${file}" in ./math.h )
|
||||
fixlist="${fixlist}
|
||||
|
|
@ -1688,7 +1667,7 @@ s/\\+++fixinc_eol+++/\\/g
|
|||
|
||||
|
||||
#
|
||||
# Fix 50: Nested_Comment
|
||||
# Fix 49: Nested_Comment
|
||||
#
|
||||
case "${file}" in ./rpc/rpc.h )
|
||||
fixlist="${fixlist}
|
||||
|
|
@ -1706,7 +1685,7 @@ s/\\+++fixinc_eol+++/\\/g
|
|||
|
||||
|
||||
#
|
||||
# Fix 51: News_Os_Recursion
|
||||
# Fix 50: News_Os_Recursion
|
||||
#
|
||||
case "${file}" in ./stdlib.h )
|
||||
if ( test -n "`egrep '#include <stdlib.h>' ${file}`"
|
||||
|
|
@ -1732,7 +1711,7 @@ s/\\+++fixinc_eol+++/\\/g
|
|||
|
||||
|
||||
#
|
||||
# Fix 52: Next_Math_Prefix
|
||||
# Fix 51: Next_Math_Prefix
|
||||
#
|
||||
case "${file}" in ./ansi/math.h )
|
||||
if ( test -n "`egrep '^extern.*double.*__const__.*' ${file}`"
|
||||
|
|
@ -1757,7 +1736,7 @@ s/\\+++fixinc_eol+++/\\/g
|
|||
|
||||
|
||||
#
|
||||
# Fix 53: Next_Template
|
||||
# Fix 52: Next_Template
|
||||
#
|
||||
case "${file}" in ./bsd/libc.h )
|
||||
if ( test -n "`egrep 'template' ${file}`"
|
||||
|
|
@ -1779,7 +1758,7 @@ s/\\+++fixinc_eol+++/\\/g
|
|||
|
||||
|
||||
#
|
||||
# Fix 54: Next_Volitile
|
||||
# Fix 53: Next_Volitile
|
||||
#
|
||||
case "${file}" in ./ansi/stdlib.h )
|
||||
if ( test -n "`egrep 'volatile' ${file}`"
|
||||
|
|
@ -1801,7 +1780,7 @@ s/\\+++fixinc_eol+++/\\/g
|
|||
|
||||
|
||||
#
|
||||
# Fix 55: Next_Wait_Union
|
||||
# Fix 54: Next_Wait_Union
|
||||
#
|
||||
case "${file}" in ./sys/wait.h )
|
||||
if ( test -n "`egrep 'wait\\(union wait' ${file}`"
|
||||
|
|
@ -1822,7 +1801,7 @@ s/\\+++fixinc_eol+++/\\/g
|
|||
|
||||
|
||||
#
|
||||
# Fix 56: Nodeent_Syntax
|
||||
# Fix 55: Nodeent_Syntax
|
||||
#
|
||||
case "${file}" in ./netdnet/dnetdb.h )
|
||||
fixlist="${fixlist}
|
||||
|
|
@ -1840,7 +1819,7 @@ s/\\+++fixinc_eol+++/\\/g
|
|||
|
||||
|
||||
#
|
||||
# Fix 57: Osf_Namespace_A
|
||||
# Fix 56: Osf_Namespace_A
|
||||
#
|
||||
case "${file}" in ./reg_types.h | \
|
||||
./sys/lc_core.h )
|
||||
|
|
@ -1867,7 +1846,7 @@ s/\\+++fixinc_eol+++/\\/g
|
|||
|
||||
|
||||
#
|
||||
# Fix 58: Osf_Namespace_B
|
||||
# Fix 57: Osf_Namespace_B
|
||||
#
|
||||
case "${file}" in ./regex.h )
|
||||
if ( test '(' -r reg_types.h ')' -a \
|
||||
|
|
@ -1895,7 +1874,7 @@ typedef __regmatch_t regmatch_t;
|
|||
|
||||
|
||||
#
|
||||
# Fix 59: Pthread_Page_Size
|
||||
# Fix 58: Pthread_Page_Size
|
||||
#
|
||||
case "${file}" in ./pthread.h )
|
||||
if ( test -n "`egrep '^int __page_size' ${file}`"
|
||||
|
|
@ -1916,7 +1895,7 @@ typedef __regmatch_t regmatch_t;
|
|||
|
||||
|
||||
#
|
||||
# Fix 60: Rs6000_Double
|
||||
# Fix 59: Rs6000_Double
|
||||
#
|
||||
case "${file}" in ./math.h )
|
||||
if ( test -n "`egrep '[^a-zA-Z_]class\\(' ${file}`"
|
||||
|
|
@ -1942,7 +1921,7 @@ typedef __regmatch_t regmatch_t;
|
|||
|
||||
|
||||
#
|
||||
# Fix 61: Rs6000_Fchmod
|
||||
# Fix 60: Rs6000_Fchmod
|
||||
#
|
||||
case "${file}" in ./sys/stat.h )
|
||||
if ( test -n "`egrep 'fchmod\\(char' ${file}`"
|
||||
|
|
@ -1963,7 +1942,7 @@ typedef __regmatch_t regmatch_t;
|
|||
|
||||
|
||||
#
|
||||
# Fix 62: Rs6000_Param
|
||||
# Fix 61: Rs6000_Param
|
||||
#
|
||||
case "${file}" in ./stdio.h | \
|
||||
./unistd.h )
|
||||
|
|
@ -1982,7 +1961,7 @@ typedef __regmatch_t regmatch_t;
|
|||
|
||||
|
||||
#
|
||||
# Fix 63: Sony_Include
|
||||
# Fix 62: Sony_Include
|
||||
#
|
||||
case "${file}" in ./machine/machparam.h )
|
||||
if ( test -n "`egrep '\"\\.\\./machine/endian.h\"' ${file}`"
|
||||
|
|
@ -2003,7 +1982,7 @@ typedef __regmatch_t regmatch_t;
|
|||
|
||||
|
||||
#
|
||||
# Fix 64: Statsswtch
|
||||
# Fix 63: Statsswtch
|
||||
#
|
||||
case "${file}" in ./rpcsvc/rstat.h )
|
||||
if ( test -n "`egrep 'boottime$' ${file}`"
|
||||
|
|
@ -2024,7 +2003,7 @@ typedef __regmatch_t regmatch_t;
|
|||
|
||||
|
||||
#
|
||||
# Fix 65: Stdio_Va_List
|
||||
# Fix 64: Stdio_Va_List
|
||||
#
|
||||
case "${file}" in ./stdio.h )
|
||||
fixlist="${fixlist}
|
||||
|
|
@ -2063,7 +2042,7 @@ typedef __regmatch_t regmatch_t;
|
|||
|
||||
|
||||
#
|
||||
# Fix 66: Sun_Bogus_Ifdef
|
||||
# Fix 65: Sun_Bogus_Ifdef
|
||||
#
|
||||
case "${file}" in ./hsfs/hsfs_spec.h | \
|
||||
./hsfs/iso_spec.h )
|
||||
|
|
@ -2085,7 +2064,7 @@ typedef __regmatch_t regmatch_t;
|
|||
|
||||
|
||||
#
|
||||
# Fix 67: Sun_Bogus_Ifdef_Sun4c
|
||||
# Fix 66: Sun_Bogus_Ifdef_Sun4c
|
||||
#
|
||||
case "${file}" in ./hsfs/hsnode.h )
|
||||
if ( test -n "`egrep '#ifdef __i386__ || __sun4c__' ${file}`"
|
||||
|
|
@ -2106,7 +2085,7 @@ typedef __regmatch_t regmatch_t;
|
|||
|
||||
|
||||
#
|
||||
# Fix 68: Sun_Catmacro
|
||||
# Fix 67: Sun_Catmacro
|
||||
#
|
||||
case "${file}" in ./pixrect/memvar.h )
|
||||
if ( test -n "`egrep '^#define[ ]+CAT\\(a,b\\)' ${file}`"
|
||||
|
|
@ -2134,7 +2113,7 @@ typedef __regmatch_t regmatch_t;
|
|||
|
||||
|
||||
#
|
||||
# Fix 69: Sun_Malloc
|
||||
# Fix 68: Sun_Malloc
|
||||
#
|
||||
case "${file}" in ./malloc.h )
|
||||
fixlist="${fixlist}
|
||||
|
|
@ -2155,7 +2134,7 @@ typedef __regmatch_t regmatch_t;
|
|||
|
||||
|
||||
#
|
||||
# Fix 70: Sun_Memcpy
|
||||
# Fix 69: Sun_Memcpy
|
||||
#
|
||||
case "${file}" in ./memory.h )
|
||||
if ( test -n "`egrep '/\\* @\\(#\\)(head/memory.h 50.1 |memory\\.h 1\\.[2-4] 8./../.. SMI; from S5R2 1\\.2 )\\*/' ${file}`"
|
||||
|
|
@ -2197,7 +2176,7 @@ extern int memcmp();\
|
|||
|
||||
|
||||
#
|
||||
# Fix 71: Sun_Rusers_Semi
|
||||
# Fix 70: Sun_Rusers_Semi
|
||||
#
|
||||
case "${file}" in ./rpcsvc/rusers.h )
|
||||
if ( test -n "`egrep '_cnt$' ${file}`"
|
||||
|
|
@ -2218,7 +2197,7 @@ extern int memcmp();\
|
|||
|
||||
|
||||
#
|
||||
# Fix 72: Sun_Signal
|
||||
# Fix 71: Sun_Signal
|
||||
#
|
||||
case "${file}" in ./sys/signal.h | \
|
||||
./signal.h )
|
||||
|
|
@ -2247,7 +2226,7 @@ void (*signal(...))(...);\
|
|||
|
||||
|
||||
#
|
||||
# Fix 73: Sun_Auth_Proto
|
||||
# Fix 72: Sun_Auth_Proto
|
||||
#
|
||||
case "${file}" in ./rpc/auth.h | \
|
||||
./rpc/clnt.h | \
|
||||
|
|
@ -2276,7 +2255,7 @@ void (*signal(...))(...);\
|
|||
|
||||
|
||||
#
|
||||
# Fix 74: Sunos_Matherr_Decl
|
||||
# Fix 73: Sunos_Matherr_Decl
|
||||
#
|
||||
case "${file}" in ./math.h )
|
||||
fixlist="${fixlist}
|
||||
|
|
@ -2297,7 +2276,7 @@ struct exception;
|
|||
|
||||
|
||||
#
|
||||
# Fix 75: Sunos_Strlen
|
||||
# Fix 74: Sunos_Strlen
|
||||
#
|
||||
case "${file}" in ./strings.h )
|
||||
fixlist="${fixlist}
|
||||
|
|
@ -2315,7 +2294,7 @@ struct exception;
|
|||
|
||||
|
||||
#
|
||||
# Fix 76: Systypes
|
||||
# Fix 75: Systypes
|
||||
#
|
||||
case "${file}" in ./sys/types.h | \
|
||||
./stdlib.h | \
|
||||
|
|
@ -2369,7 +2348,7 @@ typedef __SIZE_TYPE__ size_t;\
|
|||
|
||||
|
||||
#
|
||||
# Fix 77: Systypes_For_Aix
|
||||
# Fix 76: Systypes_For_Aix
|
||||
#
|
||||
case "${file}" in ./sys/types.h )
|
||||
if ( test -n "`egrep 'typedef[ ][ ]*[A-Za-z_][ A-Za-z_]*[ ]size_t' ${file}`" -a \
|
||||
|
|
@ -2397,7 +2376,7 @@ typedef __SIZE_TYPE__ size_t;\
|
|||
|
||||
|
||||
#
|
||||
# Fix 78: Sysv68_String
|
||||
# Fix 77: Sysv68_String
|
||||
#
|
||||
case "${file}" in ./string.h )
|
||||
fixlist="${fixlist}
|
||||
|
|
@ -2425,7 +2404,7 @@ extern unsigned int\
|
|||
|
||||
|
||||
#
|
||||
# Fix 79: Sysz_Stdlib_For_Sun
|
||||
# Fix 78: Sysz_Stdlib_For_Sun
|
||||
#
|
||||
case "${file}" in ./stdlib.h )
|
||||
fixlist="${fixlist}
|
||||
|
|
@ -2455,7 +2434,7 @@ extern unsigned int\
|
|||
|
||||
|
||||
#
|
||||
# Fix 80: Sysz_Stdtypes_For_Sun
|
||||
# Fix 79: Sysz_Stdtypes_For_Sun
|
||||
#
|
||||
case "${file}" in ./sys/stdtypes.h )
|
||||
fixlist="${fixlist}
|
||||
|
|
@ -2493,7 +2472,7 @@ extern unsigned int\
|
|||
|
||||
|
||||
#
|
||||
# Fix 81: Tinfo_Cplusplus
|
||||
# Fix 80: Tinfo_Cplusplus
|
||||
#
|
||||
case "${file}" in ./tinfo.h )
|
||||
fixlist="${fixlist}
|
||||
|
|
@ -2511,7 +2490,7 @@ extern unsigned int\
|
|||
|
||||
|
||||
#
|
||||
# Fix 82: Ultrix_Ansi_Compat
|
||||
# Fix 81: Ultrix_Ansi_Compat
|
||||
#
|
||||
case "${file}" in ./ansi_compat.h )
|
||||
if ( test -n "`egrep 'ULTRIX' ${file}`"
|
||||
|
|
@ -2535,7 +2514,7 @@ extern unsigned int\
|
|||
|
||||
|
||||
#
|
||||
# Fix 83: Ultrix_Fix_Fixproto
|
||||
# Fix 82: Ultrix_Fix_Fixproto
|
||||
#
|
||||
case "${file}" in ./sys/utsname.h )
|
||||
if ( test -n "`egrep 'ULTRIX' ${file}`"
|
||||
|
|
@ -2558,7 +2537,7 @@ struct utsname;
|
|||
|
||||
|
||||
#
|
||||
# Fix 84: Ultrix_Atof_Param
|
||||
# Fix 83: Ultrix_Atof_Param
|
||||
#
|
||||
case "${file}" in ./math.h )
|
||||
fixlist="${fixlist}
|
||||
|
|
@ -2580,7 +2559,7 @@ struct utsname;
|
|||
|
||||
|
||||
#
|
||||
# Fix 85: Ultrix_Const
|
||||
# Fix 84: Ultrix_Const
|
||||
#
|
||||
case "${file}" in ./stdio.h )
|
||||
fixlist="${fixlist}
|
||||
|
|
@ -2606,7 +2585,7 @@ struct utsname;
|
|||
|
||||
|
||||
#
|
||||
# Fix 86: Ultrix_Ifdef
|
||||
# Fix 85: Ultrix_Ifdef
|
||||
#
|
||||
case "${file}" in ./sys/file.h )
|
||||
if ( test -n "`egrep '#ifdef KERNEL' ${file}`"
|
||||
|
|
@ -2627,7 +2606,7 @@ struct utsname;
|
|||
|
||||
|
||||
#
|
||||
# Fix 87: Ultrix_Nested_Cmnt
|
||||
# Fix 86: Ultrix_Nested_Cmnt
|
||||
#
|
||||
case "${file}" in ./rpc/svc.h )
|
||||
fixlist="${fixlist}
|
||||
|
|
@ -2645,7 +2624,7 @@ struct utsname;
|
|||
|
||||
|
||||
#
|
||||
# Fix 88: Ultrix_Static
|
||||
# Fix 87: Ultrix_Static
|
||||
#
|
||||
case "${file}" in ./machine/cpu.h )
|
||||
if ( test -n "`egrep '#include \"r[34]_cpu' ${file}`"
|
||||
|
|
@ -2668,7 +2647,7 @@ struct utsname;
|
|||
|
||||
|
||||
#
|
||||
# Fix 89: Undefine_Null
|
||||
# Fix 88: Undefine_Null
|
||||
#
|
||||
if ( test -n "`egrep '^#[ ]*define[ ]*[ ]NULL[ ]' ${file}`" -a \
|
||||
-z "`egrep '#[ ]*(ifn|un)def[ ]*[ ]NULL($|[ ])' ${file}`"
|
||||
|
|
@ -2689,7 +2668,7 @@ struct utsname;
|
|||
|
||||
|
||||
#
|
||||
# Fix 90: Va_I960_Macro
|
||||
# Fix 89: Va_I960_Macro
|
||||
#
|
||||
case "${file}" in ./arch/i960/archI960.h )
|
||||
if ( test -n "`egrep '__(vsiz|vali|vpad|alignof__)' ${file}`"
|
||||
|
|
@ -2713,7 +2692,7 @@ struct utsname;
|
|||
|
||||
|
||||
#
|
||||
# Fix 91: Void_Null
|
||||
# Fix 90: Void_Null
|
||||
#
|
||||
case "${file}" in ./curses.h | \
|
||||
./dbm.h | \
|
||||
|
|
@ -2744,7 +2723,7 @@ struct utsname;
|
|||
|
||||
|
||||
#
|
||||
# Fix 92: Vxworks_Gcc_Problem
|
||||
# Fix 91: Vxworks_Gcc_Problem
|
||||
#
|
||||
case "${file}" in ./types/vxTypesBase.h )
|
||||
if ( test -n "`egrep '__GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__' ${file}`"
|
||||
|
|
@ -2786,7 +2765,7 @@ struct utsname;
|
|||
|
||||
|
||||
#
|
||||
# Fix 93: Vxworks_Needs_Vxtypes
|
||||
# Fix 92: Vxworks_Needs_Vxtypes
|
||||
#
|
||||
case "${file}" in ./time.h )
|
||||
if ( test -n "`egrep 'uint_t[ ][ ]*_clocks_per_sec' ${file}`"
|
||||
|
|
@ -2807,7 +2786,7 @@ struct utsname;
|
|||
|
||||
|
||||
#
|
||||
# Fix 94: Vxworks_Needs_Vxworks
|
||||
# Fix 93: Vxworks_Needs_Vxworks
|
||||
#
|
||||
case "${file}" in ./sys/stat.h )
|
||||
if ( test -n "`egrep '#[ ]define[ ][ ]*__INCstath' ${file}`" -a \
|
||||
|
|
@ -2833,7 +2812,7 @@ struct utsname;
|
|||
|
||||
|
||||
#
|
||||
# Fix 95: Vxworks_Time
|
||||
# Fix 94: Vxworks_Time
|
||||
#
|
||||
case "${file}" in ./time.h )
|
||||
if ( test -n "`egrep 'VOIDFUNCPTR' ${file}`" -a \
|
||||
|
|
@ -2865,7 +2844,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\
|
|||
|
||||
|
||||
#
|
||||
# Fix 96: X11_Class
|
||||
# Fix 95: X11_Class
|
||||
#
|
||||
case "${file}" in ./X11/ShellP.h )
|
||||
if ( test -z "`egrep '__cplusplus' ${file}`"
|
||||
|
|
@ -2893,7 +2872,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\
|
|||
|
||||
|
||||
#
|
||||
# Fix 97: X11_Class_Usage
|
||||
# Fix 96: X11_Class_Usage
|
||||
#
|
||||
case "${file}" in ./Xm/BaseClassI.h )
|
||||
if ( test -z "`egrep '__cplusplus' ${file}`"
|
||||
|
|
@ -2914,7 +2893,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\
|
|||
|
||||
|
||||
#
|
||||
# Fix 98: X11_New
|
||||
# Fix 97: X11_New
|
||||
#
|
||||
case "${file}" in ./Xm/Traversal.h )
|
||||
if ( test -z "`egrep '__cplusplus' ${file}`"
|
||||
|
|
@ -2943,7 +2922,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\
|
|||
|
||||
|
||||
#
|
||||
# Fix 99: X11_Sprintf
|
||||
# Fix 98: X11_Sprintf
|
||||
#
|
||||
case "${file}" in ./X11*/Xmu.h )
|
||||
fixlist="${fixlist}
|
||||
|
|
@ -2963,7 +2942,7 @@ extern char * sprintf();\
|
|||
|
||||
|
||||
#
|
||||
# Fix 100: Zzz_Ki_Iface
|
||||
# Fix 99: Zzz_Ki_Iface
|
||||
#
|
||||
case "${file}" in ./sys/ki_iface.h )
|
||||
if ( test -n "`egrep 'These definitions are for HP Internal developers' ${file}`"
|
||||
|
|
@ -2990,7 +2969,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
|
|||
|
||||
|
||||
#
|
||||
# Fix 101: Zzz_Ki
|
||||
# Fix 100: Zzz_Ki
|
||||
#
|
||||
case "${file}" in ./sys/ki.h )
|
||||
if ( test -n "`egrep '11.00 HP-UX LP64' ${file}`"
|
||||
|
|
@ -3017,7 +2996,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
|
|||
|
||||
|
||||
#
|
||||
# Fix 102: Zzz_Ki_Calls
|
||||
# Fix 101: Zzz_Ki_Calls
|
||||
#
|
||||
case "${file}" in ./sys/ki_calls.h )
|
||||
if ( test -n "`egrep 'kthread_create_caller_t' ${file}`"
|
||||
|
|
@ -3044,7 +3023,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
|
|||
|
||||
|
||||
#
|
||||
# Fix 103: Zzz_Ki_Defs
|
||||
# Fix 102: Zzz_Ki_Defs
|
||||
#
|
||||
case "${file}" in ./sys/ki_defs.h )
|
||||
if ( test -n "`egrep 'Kernel Instrumentation Definitions' ${file}`"
|
||||
|
|
@ -3071,7 +3050,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
|
|||
|
||||
|
||||
#
|
||||
# Fix 104: Zzz_Bad_Fixes
|
||||
# Fix 103: Zzz_Bad_Fixes
|
||||
#
|
||||
case "${file}" in ./sundev/ipi_error.h )
|
||||
fixlist="${fixlist}
|
||||
|
|
@ -3095,7 +3074,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
|
|||
|
||||
|
||||
#
|
||||
# Fix 105: Zzz_Time
|
||||
# Fix 104: Zzz_Time
|
||||
#
|
||||
case "${file}" in ./sys/time.h )
|
||||
if ( test -n "`egrep '11.0 and later representation of ki time' ${file}`"
|
||||
|
|
|
|||
Loading…
Reference in New Issue