inclhack.def (avoid_bool): Enable match if typedefs are prepended by spaces.

* fixinc/inclhack.def (avoid_bool): Enable match if typedefs are
        prepended by spaces.
        (sco5_stat_wrappers): New fix.   Make sys/stat.h C++ safe.
        * fixinc/fixincl.sh, fixinc/fixincl.x, fixinc/inclhack.sh: Rebuilt.

From-SVN: r26665
This commit is contained in:
Robert Lipe 1999-04-26 22:57:01 +00:00 committed by Jeff Law
parent 6a9c4aed1a
commit 26e2e81da0
5 changed files with 290 additions and 174 deletions

View File

@ -1,3 +1,10 @@
Mon Apr 26 23:55:50 1999 Robert Lipe <robertlipe@usa.net>
* fixinc/inclhack.def (avoid_bool): Enable match if typedefs are
prepended by spaces.
(sco5_stat_wrappers): New fix. Make sys/stat.h C++ safe.
* fixinc/fixincl.sh, fixinc/fixincl.x, fixinc/inclhack.sh: Rebuilt.
Mon Apr 26 23:28:54 1999 Mumit Khan <khan@xraylith.wisc.edu>
Donn Terry <donn@interix.com>

View File

@ -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 103 fixup scripts.
# This script contains 104 fixup scripts.
#
# See README-fixinc for more information.
#

View File

@ -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 103 fixup descriptions.
* This file contains 104 fixup descriptions.
*
* See README-fixinc for more information.
*
@ -328,6 +328,10 @@ const char* apzAvoid_BoolPatch[] = { "sed",
"#ifndef __cplusplus\n",
"-e", "/^typedef[ \t][ \t]*char[ \t][ \t]*bool[ \t]*;/a\\\n"
"#endif\n",
"-e", "/^[ ]*typedef[ \t][ \t]*unsigned char[ \t][ \t]*bool[ \t]*;/i\\\n"
"#ifndef __cplusplus\n",
"-e", "/^[ ]*typedef[ \t][ \t]*unsigned char[ \t][ \t]*bool[ \t]*;/a\\\n"
"#endif\n",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
@ -655,7 +659,43 @@ const char* apzEcd_CursorPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 19 - Else_Label fix
* Description 19 - Sco5_Stat_Wrappers fix
*/
tSCC zSco5_Stat_WrappersName[] =
"Sco5_Stat_Wrappers";
/*
* File name selection pattern
*/
tSCC zSco5_Stat_WrappersList[] =
"|" "sys/stat.h" "|";
/*
* Machine/OS name selection pattern
*/
tSCC* apzSco5_Stat_WrappersMachs[] = {
"i*86-*-sco3.2v5*",
(const char*)NULL };
#define SCO5_STAT_WRAPPERS_TEST_CT 0
#define SCO5_STAT_WRAPPERS_RE_CT 0
#define aSco5_Stat_WrappersTests (tTestDesc*)NULL
/*
* Fix Command Arguments for Sco5_Stat_Wrappers
*/
const char* apzSco5_Stat_WrappersPatch[] = { "sed",
"-e", "/^static int[ \t]*[a-z]*stat(/i\\\n"
"#ifdef __cplusplus\\\n"
"extern \"C\"\\\n"
"{\\\n"
"#endif\\\n",
"-e", "/^}$/a\\\n"
"#ifdef __cplusplus\\\n"
"}\\\n"
"#endif /* __cplusplus */\\\n",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 20 - Else_Label fix
*/
tSCC zElse_LabelName[] =
"Else_Label";
@ -694,7 +734,7 @@ const char* apzElse_LabelPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 20 - Endif_Label fix
* Description 21 - Endif_Label fix
*/
tSCC zEndif_LabelName[] =
"Endif_Label";
@ -734,7 +774,7 @@ const char* apzEndif_LabelPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 21 - Hp_Inline fix
* Description 22 - Hp_Inline fix
*/
tSCC zHp_InlineName[] =
"Hp_Inline";
@ -769,7 +809,7 @@ const char* apzHp_InlinePatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 22 - Hp_Sysfile fix
* Description 23 - Hp_Sysfile fix
*/
tSCC zHp_SysfileName[] =
"Hp_Sysfile";
@ -803,7 +843,7 @@ const char* apzHp_SysfilePatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 23 - Cxx_Unready fix
* Description 24 - Cxx_Unready fix
*/
tSCC zCxx_UnreadyName[] =
"Cxx_Unready";
@ -846,7 +886,7 @@ const char* apzCxx_UnreadyPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 24 - Hpux_Maxint fix
* Description 25 - Hpux_Maxint fix
*/
tSCC zHpux_MaxintName[] =
"Hpux_Maxint";
@ -875,7 +915,7 @@ const char* apzHpux_MaxintPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 25 - Hpux_Systime fix
* Description 26 - Hpux_Systime fix
*/
tSCC zHpux_SystimeName[] =
"Hpux_Systime";
@ -909,7 +949,7 @@ const char* apzHpux_SystimePatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 26 - Interactv_Add1 fix
* Description 27 - Interactv_Add1 fix
*/
tSCC zInteractv_Add1Name[] =
"Interactv_Add1";
@ -951,7 +991,7 @@ const char* apzInteractv_Add1Patch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 27 - Interactv_Add2 fix
* Description 28 - Interactv_Add2 fix
*/
tSCC zInteractv_Add2Name[] =
"Interactv_Add2";
@ -988,7 +1028,7 @@ const char* apzInteractv_Add2Patch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 28 - Interactv_Add3 fix
* Description 29 - Interactv_Add3 fix
*/
tSCC zInteractv_Add3Name[] =
"Interactv_Add3";
@ -1026,7 +1066,7 @@ const char* apzInteractv_Add3Patch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 29 - Io_Def_Quotes fix
* Description 30 - Io_Def_Quotes fix
*/
tSCC zIo_Def_QuotesName[] =
"Io_Def_Quotes";
@ -1061,7 +1101,7 @@ const char* apzIo_Def_QuotesPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 30 - Ioctl_Fix_Ctrl fix
* Description 31 - Ioctl_Fix_Ctrl fix
*/
tSCC zIoctl_Fix_CtrlName[] =
"Ioctl_Fix_Ctrl";
@ -1098,7 +1138,7 @@ const char* apzIoctl_Fix_CtrlPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 31 - Ip_Missing_Semi fix
* Description 32 - Ip_Missing_Semi fix
*/
tSCC zIp_Missing_SemiName[] =
"Ip_Missing_Semi";
@ -1124,7 +1164,7 @@ const char* apzIp_Missing_SemiPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 32 - Irix_Multiline_Cmnt fix
* Description 33 - Irix_Multiline_Cmnt fix
*/
tSCC zIrix_Multiline_CmntName[] =
"Irix_Multiline_Cmnt";
@ -1151,7 +1191,7 @@ const char* apzIrix_Multiline_CmntPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 33 - Irix_Sockaddr fix
* Description 34 - Irix_Sockaddr fix
*/
tSCC zIrix_SockaddrName[] =
"Irix_Sockaddr";
@ -1186,7 +1226,7 @@ const char* apzIrix_SockaddrPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 34 - Irix_Struct__File fix
* Description 35 - Irix_Struct__File fix
*/
tSCC zIrix_Struct__FileName[] =
"Irix_Struct__File";
@ -1213,7 +1253,7 @@ const char* apzIrix_Struct__FilePatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 35 - Isc_Fmod fix
* Description 36 - Isc_Fmod fix
*/
tSCC zIsc_FmodName[] =
"Isc_Fmod";
@ -1247,7 +1287,7 @@ const char* apzIsc_FmodPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 36 - Motorola_Nested fix
* Description 37 - Motorola_Nested fix
*/
tSCC zMotorola_NestedName[] =
"Motorola_Nested";
@ -1277,7 +1317,7 @@ const char* apzMotorola_NestedPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 37 - Isc_Sys_Limits fix
* Description 38 - Isc_Sys_Limits fix
*/
tSCC zIsc_Sys_LimitsName[] =
"Isc_Sys_Limits";
@ -1312,7 +1352,7 @@ const char* apzIsc_Sys_LimitsPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 38 - Kandr_Concat fix
* Description 39 - Kandr_Concat fix
*/
tSCC zKandr_ConcatName[] =
"Kandr_Concat";
@ -1363,7 +1403,7 @@ const char* apzKandr_ConcatPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 39 - Limits_Ifndefs fix
* Description 40 - Limits_Ifndefs fix
*/
tSCC zLimits_IfndefsName[] =
"Limits_Ifndefs";
@ -1421,7 +1461,7 @@ const char* apzLimits_IfndefsPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 40 - Lynx_Void_Int fix
* Description 41 - Lynx_Void_Int fix
*/
tSCC zLynx_Void_IntName[] =
"Lynx_Void_Int";
@ -1455,7 +1495,7 @@ const char* apzLynx_Void_IntPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 41 - Lynxos_Fcntl_Proto fix
* Description 42 - Lynxos_Fcntl_Proto fix
*/
tSCC zLynxos_Fcntl_ProtoName[] =
"Lynxos_Fcntl_Proto";
@ -1489,7 +1529,7 @@ const char* apzLynxos_Fcntl_ProtoPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 42 - M88k_Bad_Hypot_Opt fix
* Description 43 - M88k_Bad_Hypot_Opt fix
*/
tSCC zM88k_Bad_Hypot_OptName[] =
"M88k_Bad_Hypot_Opt";
@ -1530,7 +1570,7 @@ const char* apzM88k_Bad_Hypot_OptPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 43 - M88k_Bad_S_If fix
* Description 44 - M88k_Bad_S_If fix
*/
tSCC zM88k_Bad_S_IfName[] =
"M88k_Bad_S_If";
@ -1567,7 +1607,7 @@ const char* apzM88k_Bad_S_IfPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 44 - M88k_Multi_Incl fix
* Description 45 - M88k_Multi_Incl fix
*/
tSCC zM88k_Multi_InclName[] =
"M88k_Multi_Incl";
@ -1608,7 +1648,7 @@ const char* apzM88k_Multi_InclPatch[] = { "sh", "-c",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 45 - Machine_Name fix
* Description 46 - Machine_Name fix
*/
tSCC zMachine_NameName[] =
"Machine_Name";
@ -1677,7 +1717,7 @@ const char* apzMachine_NamePatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 46 - Math_Exception fix
* Description 47 - Math_Exception fix
*/
tSCC zMath_ExceptionName[] =
"Math_Exception";
@ -1726,7 +1766,7 @@ const char* apzMath_ExceptionPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 47 - Math_Gcc_Ifndefs fix
* Description 48 - Math_Gcc_Ifndefs fix
*/
tSCC zMath_Gcc_IfndefsName[] =
"Math_Gcc_Ifndefs";
@ -1764,7 +1804,7 @@ const char* apzMath_Gcc_IfndefsPatch[] = { "sh", "-c",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 48 - Nested_Comment fix
* Description 49 - Nested_Comment fix
*/
tSCC zNested_CommentName[] =
"Nested_Comment";
@ -1790,7 +1830,7 @@ const char* apzNested_CommentPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 49 - News_Os_Recursion fix
* Description 50 - News_Os_Recursion fix
*/
tSCC zNews_Os_RecursionName[] =
"News_Os_Recursion";
@ -1827,7 +1867,7 @@ const char* apzNews_Os_RecursionPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 50 - Next_Math_Prefix fix
* Description 51 - Next_Math_Prefix fix
*/
tSCC zNext_Math_PrefixName[] =
"Next_Math_Prefix";
@ -1865,7 +1905,7 @@ const char* apzNext_Math_PrefixPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 51 - Next_Template fix
* Description 52 - Next_Template fix
*/
tSCC zNext_TemplateName[] =
"Next_Template";
@ -1900,7 +1940,7 @@ const char* apzNext_TemplatePatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 52 - Next_Volitile fix
* Description 53 - Next_Volitile fix
*/
tSCC zNext_VolitileName[] =
"Next_Volitile";
@ -1935,7 +1975,7 @@ const char* apzNext_VolitilePatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 53 - Next_Wait_Union fix
* Description 54 - Next_Wait_Union fix
*/
tSCC zNext_Wait_UnionName[] =
"Next_Wait_Union";
@ -1969,7 +2009,7 @@ const char* apzNext_Wait_UnionPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 54 - Nodeent_Syntax fix
* Description 55 - Nodeent_Syntax fix
*/
tSCC zNodeent_SyntaxName[] =
"Nodeent_Syntax";
@ -1995,7 +2035,7 @@ const char* apzNodeent_SyntaxPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 55 - Osf_Namespace_A fix
* Description 56 - Osf_Namespace_A fix
*/
tSCC zOsf_Namespace_AName[] =
"Osf_Namespace_A";
@ -2041,7 +2081,7 @@ const char* apzOsf_Namespace_APatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 56 - Osf_Namespace_B fix
* Description 57 - Osf_Namespace_B fix
*/
tSCC zOsf_Namespace_BName[] =
"Osf_Namespace_B";
@ -2087,7 +2127,7 @@ const char* apzOsf_Namespace_BPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 57 - Pthread_Page_Size fix
* Description 58 - Pthread_Page_Size fix
*/
tSCC zPthread_Page_SizeName[] =
"Pthread_Page_Size";
@ -2121,7 +2161,7 @@ const char* apzPthread_Page_SizePatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 58 - Rs6000_Double fix
* Description 59 - Rs6000_Double fix
*/
tSCC zRs6000_DoubleName[] =
"Rs6000_Double";
@ -2158,7 +2198,7 @@ const char* apzRs6000_DoublePatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 59 - Rs6000_Fchmod fix
* Description 60 - Rs6000_Fchmod fix
*/
tSCC zRs6000_FchmodName[] =
"Rs6000_Fchmod";
@ -2192,7 +2232,7 @@ const char* apzRs6000_FchmodPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 60 - Rs6000_Param fix
* Description 61 - Rs6000_Param fix
*/
tSCC zRs6000_ParamName[] =
"Rs6000_Param";
@ -2219,7 +2259,7 @@ const char* apzRs6000_ParamPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 61 - Sony_Include fix
* Description 62 - Sony_Include fix
*/
tSCC zSony_IncludeName[] =
"Sony_Include";
@ -2253,7 +2293,7 @@ const char* apzSony_IncludePatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 62 - Statsswtch fix
* Description 63 - Statsswtch fix
*/
tSCC zStatsswtchName[] =
"Statsswtch";
@ -2287,7 +2327,7 @@ const char* apzStatsswtchPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 63 - Stdio_Va_List fix
* Description 64 - Stdio_Va_List fix
*/
tSCC zStdio_Va_ListName[] =
"Stdio_Va_List";
@ -2330,7 +2370,7 @@ const char* apzStdio_Va_ListPatch[] = { "sh", "-c",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 64 - Sun_Bogus_Ifdef fix
* Description 65 - Sun_Bogus_Ifdef fix
*/
tSCC zSun_Bogus_IfdefName[] =
"Sun_Bogus_Ifdef";
@ -2365,7 +2405,7 @@ const char* apzSun_Bogus_IfdefPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 65 - Sun_Bogus_Ifdef_Sun4c fix
* Description 66 - Sun_Bogus_Ifdef_Sun4c fix
*/
tSCC zSun_Bogus_Ifdef_Sun4cName[] =
"Sun_Bogus_Ifdef_Sun4c";
@ -2399,7 +2439,7 @@ const char* apzSun_Bogus_Ifdef_Sun4cPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 66 - Sun_Catmacro fix
* Description 67 - Sun_Catmacro fix
*/
tSCC zSun_CatmacroName[] =
"Sun_Catmacro";
@ -2438,7 +2478,7 @@ const char* apzSun_CatmacroPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 67 - Sun_Malloc fix
* Description 68 - Sun_Malloc fix
*/
tSCC zSun_MallocName[] =
"Sun_Malloc";
@ -2467,7 +2507,7 @@ const char* apzSun_MallocPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 68 - Sun_Memcpy fix
* Description 69 - Sun_Memcpy fix
*/
tSCC zSun_MemcpyName[] =
"Sun_Memcpy";
@ -2521,7 +2561,7 @@ const char* apzSun_MemcpyPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 69 - Sun_Rusers_Semi fix
* Description 70 - Sun_Rusers_Semi fix
*/
tSCC zSun_Rusers_SemiName[] =
"Sun_Rusers_Semi";
@ -2555,7 +2595,7 @@ const char* apzSun_Rusers_SemiPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 70 - Sun_Signal fix
* Description 71 - Sun_Signal fix
*/
tSCC zSun_SignalName[] =
"Sun_Signal";
@ -2595,7 +2635,7 @@ const char* apzSun_SignalPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 71 - Sun_Auth_Proto fix
* Description 72 - Sun_Auth_Proto fix
*/
tSCC zSun_Auth_ProtoName[] =
"Sun_Auth_Proto";
@ -2646,7 +2686,7 @@ const char* apzSun_Auth_ProtoPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 72 - Sunos_Matherr_Decl fix
* Description 73 - Sunos_Matherr_Decl fix
*/
tSCC zSunos_Matherr_DeclName[] =
"Sunos_Matherr_Decl";
@ -2674,7 +2714,7 @@ const char* apzSunos_Matherr_DeclPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 73 - Sunos_Strlen fix
* Description 74 - Sunos_Strlen fix
*/
tSCC zSunos_StrlenName[] =
"Sunos_Strlen";
@ -2700,7 +2740,7 @@ const char* apzSunos_StrlenPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 74 - Systypes fix
* Description 75 - Systypes fix
*/
tSCC zSystypesName[] =
"Systypes";
@ -2763,7 +2803,7 @@ const char* apzSystypesPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 75 - Systypes_For_Aix fix
* Description 76 - Systypes_For_Aix fix
*/
tSCC zSystypes_For_AixName[] =
"Systypes_For_Aix";
@ -2808,7 +2848,7 @@ const char* apzSystypes_For_AixPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 76 - Sysv68_String fix
* Description 77 - Sysv68_String fix
*/
tSCC zSysv68_StringName[] =
"Sysv68_String";
@ -2844,7 +2884,7 @@ const char* apzSysv68_StringPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 77 - Sysz_Stdlib_For_Sun fix
* Description 78 - Sysz_Stdlib_For_Sun fix
*/
tSCC zSysz_Stdlib_For_SunName[] =
"Sysz_Stdlib_For_Sun";
@ -2883,7 +2923,7 @@ const char* apzSysz_Stdlib_For_SunPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 78 - Sysz_Stdtypes_For_Sun fix
* Description 79 - Sysz_Stdtypes_For_Sun fix
*/
tSCC zSysz_Stdtypes_For_SunName[] =
"Sysz_Stdtypes_For_Sun";
@ -2923,7 +2963,7 @@ const char* apzSysz_Stdtypes_For_SunPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 79 - Tinfo_Cplusplus fix
* Description 80 - Tinfo_Cplusplus fix
*/
tSCC zTinfo_CplusplusName[] =
"Tinfo_Cplusplus";
@ -2949,7 +2989,7 @@ const char* apzTinfo_CplusplusPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 80 - Ultrix_Ansi_Compat fix
* Description 81 - Ultrix_Ansi_Compat fix
*/
tSCC zUltrix_Ansi_CompatName[] =
"Ultrix_Ansi_Compat";
@ -2985,7 +3025,7 @@ const char* apzUltrix_Ansi_CompatPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 81 - Ultrix_Fix_Fixproto fix
* Description 82 - Ultrix_Fix_Fixproto fix
*/
tSCC zUltrix_Fix_FixprotoName[] =
"Ultrix_Fix_Fixproto";
@ -3020,7 +3060,7 @@ const char* apzUltrix_Fix_FixprotoPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 82 - Ultrix_Atof_Param fix
* Description 83 - Ultrix_Atof_Param fix
*/
tSCC zUltrix_Atof_ParamName[] =
"Ultrix_Atof_Param";
@ -3050,7 +3090,7 @@ const char* apzUltrix_Atof_ParamPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 83 - Ultrix_Const fix
* Description 84 - Ultrix_Const fix
*/
tSCC zUltrix_ConstName[] =
"Ultrix_Const";
@ -3084,7 +3124,7 @@ const char* apzUltrix_ConstPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 84 - Ultrix_Ifdef fix
* Description 85 - Ultrix_Ifdef fix
*/
tSCC zUltrix_IfdefName[] =
"Ultrix_Ifdef";
@ -3118,7 +3158,7 @@ const char* apzUltrix_IfdefPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 85 - Ultrix_Nested_Cmnt fix
* Description 86 - Ultrix_Nested_Cmnt fix
*/
tSCC zUltrix_Nested_CmntName[] =
"Ultrix_Nested_Cmnt";
@ -3144,7 +3184,7 @@ const char* apzUltrix_Nested_CmntPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 86 - Ultrix_Static fix
* Description 87 - Ultrix_Static fix
*/
tSCC zUltrix_StaticName[] =
"Ultrix_Static";
@ -3180,7 +3220,7 @@ const char* apzUltrix_StaticPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 87 - Undefine_Null fix
* Description 88 - Undefine_Null fix
*/
tSCC zUndefine_NullName[] =
"Undefine_Null";
@ -3221,7 +3261,7 @@ const char* apzUndefine_NullPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 88 - Va_I960_Macro fix
* Description 89 - Va_I960_Macro fix
*/
tSCC zVa_I960_MacroName[] =
"Va_I960_Macro";
@ -3258,7 +3298,7 @@ const char* apzVa_I960_MacroPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 89 - Void_Null fix
* Description 90 - Void_Null fix
*/
tSCC zVoid_NullName[] =
"Void_Null";
@ -3302,7 +3342,7 @@ const char* apzVoid_NullPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 90 - Vxworks_Gcc_Problem fix
* Description 91 - Vxworks_Gcc_Problem fix
*/
tSCC zVxworks_Gcc_ProblemName[] =
"Vxworks_Gcc_Problem";
@ -3351,7 +3391,7 @@ const char* apzVxworks_Gcc_ProblemPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 91 - Vxworks_Needs_Vxtypes fix
* Description 92 - Vxworks_Needs_Vxtypes fix
*/
tSCC zVxworks_Needs_VxtypesName[] =
"Vxworks_Needs_Vxtypes";
@ -3385,7 +3425,7 @@ const char* apzVxworks_Needs_VxtypesPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 92 - Vxworks_Needs_Vxworks fix
* Description 93 - Vxworks_Needs_Vxworks fix
*/
tSCC zVxworks_Needs_VxworksName[] =
"Vxworks_Needs_Vxworks";
@ -3433,7 +3473,7 @@ const char* apzVxworks_Needs_VxworksPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 93 - Vxworks_Time fix
* Description 94 - Vxworks_Time fix
*/
tSCC zVxworks_TimeName[] =
"Vxworks_Time";
@ -3483,7 +3523,7 @@ const char* apzVxworks_TimePatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 94 - X11_Class fix
* Description 95 - X11_Class fix
*/
tSCC zX11_ClassName[] =
"X11_Class";
@ -3522,7 +3562,7 @@ const char* apzX11_ClassPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 95 - X11_Class_Usage fix
* Description 96 - X11_Class_Usage fix
*/
tSCC zX11_Class_UsageName[] =
"X11_Class_Usage";
@ -3556,7 +3596,7 @@ const char* apzX11_Class_UsagePatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 96 - X11_New fix
* Description 97 - X11_New fix
*/
tSCC zX11_NewName[] =
"X11_New";
@ -3596,7 +3636,7 @@ const char* apzX11_NewPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 97 - X11_Sprintf fix
* Description 98 - X11_Sprintf fix
*/
tSCC zX11_SprintfName[] =
"X11_Sprintf";
@ -3624,7 +3664,7 @@ const char* apzX11_SprintfPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 98 - Zzz_Ki_Iface fix
* Description 99 - Zzz_Ki_Iface fix
*/
tSCC zZzz_Ki_IfaceName[] =
"Zzz_Ki_Iface";
@ -3660,7 +3700,7 @@ const char* apzZzz_Ki_IfacePatch[] = { "sh", "-c",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 99 - Zzz_Ki fix
* Description 100 - Zzz_Ki fix
*/
tSCC zZzz_KiName[] =
"Zzz_Ki";
@ -3696,7 +3736,7 @@ const char* apzZzz_KiPatch[] = { "sh", "-c",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 100 - Zzz_Ki_Calls fix
* Description 101 - Zzz_Ki_Calls fix
*/
tSCC zZzz_Ki_CallsName[] =
"Zzz_Ki_Calls";
@ -3732,7 +3772,7 @@ const char* apzZzz_Ki_CallsPatch[] = { "sh", "-c",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 101 - Zzz_Ki_Defs fix
* Description 102 - Zzz_Ki_Defs fix
*/
tSCC zZzz_Ki_DefsName[] =
"Zzz_Ki_Defs";
@ -3768,7 +3808,7 @@ const char* apzZzz_Ki_DefsPatch[] = { "sh", "-c",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 102 - Zzz_Bad_Fixes fix
* Description 103 - Zzz_Bad_Fixes fix
*/
tSCC zZzz_Bad_FixesName[] =
"Zzz_Bad_Fixes";
@ -3796,7 +3836,7 @@ const char* apzZzz_Bad_FixesPatch[] = { "sh", "-c",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 103 - Zzz_Time fix
* Description 104 - Zzz_Time fix
*/
tSCC zZzz_TimeName[] =
"Zzz_Time";
@ -3835,7 +3875,7 @@ const char* apzZzz_TimePatch[] = { "sh", "-c",
* List of all fixes
*/
#define REGEX_COUNT 75
#define FIX_COUNT 103
#define FIX_COUNT 104
tFixDesc fixDescList[ FIX_COUNT ] = {
{ zAix_SyswaitName, zAix_SyswaitList,
apzAix_SyswaitMachs, (regex_t*)NULL,
@ -3927,6 +3967,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
ECD_CURSOR_TEST_CT, FD_MACH_ONLY,
aEcd_CursorTests, apzEcd_CursorPatch },
{ zSco5_Stat_WrappersName, zSco5_Stat_WrappersList,
apzSco5_Stat_WrappersMachs, (regex_t*)NULL,
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,

View File

@ -129,6 +129,12 @@ fix = {
sed = "/^typedef[ \t][ \t]*char[ \t][ \t]*bool[ \t]*;/a\\\n"
"#endif\n";
sed = "/^[ ]*typedef[ \t][ \t]*unsigned char[ \t][ \t]*bool[ \t]*;/i\\\n"
"#ifndef __cplusplus\n";
sed = "/^[ ]*typedef[ \t][ \t]*unsigned char[ \t][ \t]*bool[ \t]*;/a\\\n"
"#endif\n";
};
@ -348,6 +354,27 @@ fix = {
sed = "s/ecd.cursor/ecd_cursor/";
};
/*
* On SCO OpenServer 5.0.0 through (at least) 5.0.5 <sys/stat.h> contains
* tiny static wrappers that aren't C++ safe.
*/
fix = {
hackname = sco5_stat_wrappers;
mach = "i*86-*-sco3.2v5*";
files = "sys/stat.h";
sed = "/^static int[ \t]*[a-z]*stat(/i\\\n"
"#ifdef __cplusplus\\\n"
"extern \"C\"\\\n"
"{\\\n"
"#endif\\\n";
sed = "/^}$/a\\\n"
"#ifdef __cplusplus\\\n"
"}\\\n"
"#endif \/* __cplusplus *\/\\\n";
};
/*

View File

@ -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 103 fixup scripts.
# This script contains 104 fixup scripts.
#
# See README-fixinc for more information.
#
@ -553,6 +553,12 @@ struct rusage;
' \
-e '/^typedef[ ][ ]*char[ ][ ]*bool[ ]*;/a\
#endif
' \
-e '/^[ ]*typedef[ ][ ]*unsigned char[ ][ ]*bool[ ]*;/i\
#ifndef __cplusplus
' \
-e '/^[ ]*typedef[ ][ ]*unsigned char[ ][ ]*bool[ ]*;/a\
#endif
' \
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
@ -765,7 +771,38 @@ struct rusage;
#
# Fix 19: Else_Label
# Fix 19: Sco5_Stat_Wrappers
#
case "${file}" in ./sys/stat.h )
case "$target_canonical" in i*86-*-sco3.2v5* )
fixlist="${fixlist}
sco5_stat_wrappers"
if [ ! -r ${DESTFILE} ]
then infile=${file}
else infile=${DESTFILE} ; fi
sed -e '/^static int[ ]*[a-z]*stat(/i\
#ifdef __cplusplus\
extern "C"\
{\
#endif\
' \
-e '/^}$/a\
#ifdef __cplusplus\
}\
#endif /* __cplusplus */\
' \
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for machine type test
esac
;; # case end for file name test
esac
#
# Fix 20: Else_Label
#
if ( test -n "`egrep '^[ ]*#[ ]*else[ ]+[!-.0-~]' ${file}`"
) > /dev/null 2>&1 ; then
@ -789,7 +826,7 @@ s%^\([ ]*#[ ]*else\)[ ]*[^/ ].*%\1%' \
#
# Fix 20: Endif_Label
# Fix 21: Endif_Label
#
if ( test -n "`egrep '^[ ]*#[ ]*endif[ ]+[!-.0-z{|}~]' ${file}`"
) > /dev/null 2>&1 ; then
@ -814,7 +851,7 @@ s%^\([ ]*#[ ]*endif\)[ ]*[^/* ].*%\1%' \
#
# Fix 21: Hp_Inline
# Fix 22: Hp_Inline
#
case "${file}" in ./sys/spinlock.h )
if ( test -n "`egrep 'include.*\"\\.\\./machine/' ${file}`"
@ -836,7 +873,7 @@ s%^\([ ]*#[ ]*endif\)[ ]*[^/* ].*%\1%' \
#
# Fix 22: Hp_Sysfile
# Fix 23: Hp_Sysfile
#
case "${file}" in ./sys/file.h )
if ( test -n "`egrep 'HPUX_SOURCE' ${file}`"
@ -857,7 +894,7 @@ s%^\([ ]*#[ ]*endif\)[ ]*[^/* ].*%\1%' \
#
# Fix 23: Cxx_Unready
# Fix 24: Cxx_Unready
#
case "${file}" in ./sys/mman.h | \
./rpc/types.h )
@ -889,7 +926,7 @@ extern "C" {\
#
# Fix 24: Hpux_Maxint
# Fix 25: Hpux_Maxint
#
case "${file}" in ./sys/param.h )
fixlist="${fixlist}
@ -912,7 +949,7 @@ extern "C" {\
#
# Fix 25: Hpux_Systime
# Fix 26: Hpux_Systime
#
case "${file}" in ./sys/time.h )
if ( test -n "`egrep '^extern struct sigevent;' ${file}`"
@ -933,7 +970,7 @@ extern "C" {\
#
# Fix 26: Interactv_Add1
# Fix 27: Interactv_Add1
#
case "${file}" in ./stdio.h | \
./math.h | \
@ -960,7 +997,7 @@ extern "C" {\
#
# Fix 27: Interactv_Add2
# Fix 28: Interactv_Add2
#
case "${file}" in ./math.h )
if ( test '(' -d /etc/conf/kconfig.d ')' -a \
@ -982,7 +1019,7 @@ extern "C" {\
#
# Fix 28: Interactv_Add3
# Fix 29: Interactv_Add3
#
case "${file}" in ./sys/limits.h )
if ( test '(' -d /etc/conf/kconfig.d ')' -a \
@ -1005,7 +1042,7 @@ extern "C" {\
#
# Fix 29: Io_Def_Quotes
# Fix 30: Io_Def_Quotes
#
if ( test -n "`egrep '[ ](_|DES)IO[A-Z]*[ ]*\\( *[^,'\\'']' ${file}`"
) > /dev/null 2>&1 ; then
@ -1025,7 +1062,7 @@ extern "C" {\
#
# Fix 30: Ioctl_Fix_Ctrl
# Fix 31: Ioctl_Fix_Ctrl
#
if ( test -n "`egrep 'CTRL[ ]' ${file}`"
) > /dev/null 2>&1 ; then
@ -1047,7 +1084,7 @@ extern "C" {\
#
# Fix 31: Ip_Missing_Semi
# Fix 32: Ip_Missing_Semi
#
case "${file}" in ./netinet/ip.h )
fixlist="${fixlist}
@ -1065,7 +1102,7 @@ extern "C" {\
#
# Fix 32: Irix_Multiline_Cmnt
# Fix 33: Irix_Multiline_Cmnt
#
case "${file}" in ./sys/types.h )
fixlist="${fixlist}
@ -1084,7 +1121,7 @@ extern "C" {\
#
# Fix 33: Irix_Sockaddr
# Fix 34: Irix_Sockaddr
#
case "${file}" in ./rpc/auth.h )
if ( test -n "`egrep 'authdes_create.*struct sockaddr' ${file}`"
@ -1107,7 +1144,7 @@ struct sockaddr;
#
# Fix 34: Irix_Struct__File
# Fix 35: Irix_Struct__File
#
case "${file}" in ./rpc/xdr.h )
fixlist="${fixlist}
@ -1127,7 +1164,7 @@ struct __file_s;
#
# Fix 35: Isc_Fmod
# Fix 36: Isc_Fmod
#
case "${file}" in ./math.h )
if ( test -n "`egrep 'fmod\\(double\\)' ${file}`"
@ -1148,7 +1185,7 @@ struct __file_s;
#
# Fix 36: Motorola_Nested
# Fix 37: Motorola_Nested
#
case "${file}" in ./limits.h | \
./sys/limits.h )
@ -1171,7 +1208,7 @@ struct __file_s;
#
# Fix 37: Isc_Sys_Limits
# Fix 38: Isc_Sys_Limits
#
case "${file}" in ./sys/limits.h )
if ( test -n "`egrep 'CHILD_MAX' ${file}`"
@ -1193,7 +1230,7 @@ struct __file_s;
#
# Fix 38: Kandr_Concat
# Fix 39: Kandr_Concat
#
case "${file}" in ./sparc/asm_linkage.h | \
./sun3/asm_linkage.h | \
@ -1231,7 +1268,7 @@ struct __file_s;
#
# Fix 39: Limits_Ifndefs
# Fix 40: Limits_Ifndefs
#
case "${file}" in ./limits.h )
if ( test -z "`egrep 'ifndef[ ]+FLT_MIN' ${file}`"
@ -1288,7 +1325,7 @@ struct __file_s;
#
# Fix 40: Lynx_Void_Int
# Fix 41: Lynx_Void_Int
#
case "${file}" in ./curses.h )
if ( test -n "`egrep '#[ ]*define[ ]+void[ ]+int' ${file}`"
@ -1309,7 +1346,7 @@ struct __file_s;
#
# Fix 41: Lynxos_Fcntl_Proto
# Fix 42: Lynxos_Fcntl_Proto
#
case "${file}" in ./fcntl.h )
if ( test -n "`egrep 'fcntl.*\\(int, int, int\\)' ${file}`"
@ -1330,7 +1367,7 @@ struct __file_s;
#
# Fix 42: M88k_Bad_Hypot_Opt
# Fix 43: M88k_Bad_Hypot_Opt
#
case "${file}" in ./math.h )
case "$target_canonical" in m88k-motorola-sysv3* )
@ -1365,7 +1402,7 @@ static __inline__ double fake_hypot (x, y)\
#
# Fix 43: M88k_Bad_S_If
# Fix 44: M88k_Bad_S_If
#
case "${file}" in ./sys/stat.h )
case "$target_canonical" in m88k-*-sysv3* )
@ -1390,7 +1427,7 @@ static __inline__ double fake_hypot (x, y)\
#
# Fix 44: M88k_Multi_Incl
# Fix 45: M88k_Multi_Incl
#
case "${file}" in ./time.h )
case "$target_canonical" in m88k-tektronix-sysv3* )
@ -1423,7 +1460,7 @@ static __inline__ double fake_hypot (x, y)\
#
# Fix 45: 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
@ -1475,7 +1512,7 @@ s/\\+++fixinc_eol+++/\\/g
#
# Fix 46: Math_Exception
# Fix 47: Math_Exception
#
case "${file}" in ./math.h )
if ( test -n "`egrep 'struct exception' ${file}`"
@ -1515,7 +1552,7 @@ s/\\+++fixinc_eol+++/\\/g
#
# Fix 47: Math_Gcc_Ifndefs
# Fix 48: Math_Gcc_Ifndefs
#
case "${file}" in ./math.h )
fixlist="${fixlist}
@ -1549,7 +1586,7 @@ s/\\+++fixinc_eol+++/\\/g
#
# Fix 48: Nested_Comment
# Fix 49: Nested_Comment
#
case "${file}" in ./rpc/rpc.h )
fixlist="${fixlist}
@ -1567,7 +1604,7 @@ s/\\+++fixinc_eol+++/\\/g
#
# Fix 49: News_Os_Recursion
# Fix 50: News_Os_Recursion
#
case "${file}" in ./stdlib.h )
if ( test -n "`egrep '#include <stdlib.h>' ${file}`"
@ -1593,7 +1630,7 @@ s/\\+++fixinc_eol+++/\\/g
#
# Fix 50: Next_Math_Prefix
# Fix 51: Next_Math_Prefix
#
case "${file}" in ./ansi/math.h )
if ( test -n "`egrep '^extern.*double.*__const__.*' ${file}`"
@ -1618,7 +1655,7 @@ s/\\+++fixinc_eol+++/\\/g
#
# Fix 51: Next_Template
# Fix 52: Next_Template
#
case "${file}" in ./bsd/libc.h )
if ( test -n "`egrep 'template' ${file}`"
@ -1640,7 +1677,7 @@ s/\\+++fixinc_eol+++/\\/g
#
# Fix 52: Next_Volitile
# Fix 53: Next_Volitile
#
case "${file}" in ./ansi/stdlib.h )
if ( test -n "`egrep 'volatile' ${file}`"
@ -1662,7 +1699,7 @@ s/\\+++fixinc_eol+++/\\/g
#
# Fix 53: Next_Wait_Union
# Fix 54: Next_Wait_Union
#
case "${file}" in ./sys/wait.h )
if ( test -n "`egrep 'wait\\(union wait' ${file}`"
@ -1683,7 +1720,7 @@ s/\\+++fixinc_eol+++/\\/g
#
# Fix 54: Nodeent_Syntax
# Fix 55: Nodeent_Syntax
#
case "${file}" in ./netdnet/dnetdb.h )
fixlist="${fixlist}
@ -1701,7 +1738,7 @@ s/\\+++fixinc_eol+++/\\/g
#
# Fix 55: Osf_Namespace_A
# Fix 56: Osf_Namespace_A
#
case "${file}" in ./reg_types.h | \
./sys/lc_core.h )
@ -1728,7 +1765,7 @@ s/\\+++fixinc_eol+++/\\/g
#
# Fix 56: Osf_Namespace_B
# Fix 57: Osf_Namespace_B
#
case "${file}" in ./regex.h )
if ( test '(' -r reg_types.h ')' -a \
@ -1756,7 +1793,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 57: Pthread_Page_Size
# Fix 58: Pthread_Page_Size
#
case "${file}" in ./pthread.h )
if ( test -n "`egrep '^int __page_size' ${file}`"
@ -1777,7 +1814,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 58: Rs6000_Double
# Fix 59: Rs6000_Double
#
case "${file}" in ./math.h )
if ( test -n "`egrep '[^a-zA-Z_]class\\(' ${file}`"
@ -1803,7 +1840,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 59: Rs6000_Fchmod
# Fix 60: Rs6000_Fchmod
#
case "${file}" in ./sys/stat.h )
if ( test -n "`egrep 'fchmod\\(char' ${file}`"
@ -1824,7 +1861,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 60: Rs6000_Param
# Fix 61: Rs6000_Param
#
case "${file}" in ./stdio.h | \
./unistd.h )
@ -1843,7 +1880,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 61: Sony_Include
# Fix 62: Sony_Include
#
case "${file}" in ./machine/machparam.h )
if ( test -n "`egrep '\"\\.\\./machine/endian.h\"' ${file}`"
@ -1864,7 +1901,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 62: Statsswtch
# Fix 63: Statsswtch
#
case "${file}" in ./rpcsvc/rstat.h )
if ( test -n "`egrep 'boottime$' ${file}`"
@ -1885,7 +1922,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 63: Stdio_Va_List
# Fix 64: Stdio_Va_List
#
case "${file}" in ./stdio.h )
fixlist="${fixlist}
@ -1924,7 +1961,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 64: Sun_Bogus_Ifdef
# Fix 65: Sun_Bogus_Ifdef
#
case "${file}" in ./hsfs/hsfs_spec.h | \
./hsfs/iso_spec.h )
@ -1946,7 +1983,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 65: Sun_Bogus_Ifdef_Sun4c
# Fix 66: Sun_Bogus_Ifdef_Sun4c
#
case "${file}" in ./hsfs/hsnode.h )
if ( test -n "`egrep '#ifdef __i386__ || __sun4c__' ${file}`"
@ -1967,7 +2004,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 66: Sun_Catmacro
# Fix 67: Sun_Catmacro
#
case "${file}" in ./pixrect/memvar.h )
if ( test -n "`egrep '^#define[ ]+CAT(a,b)' ${file}`"
@ -1995,7 +2032,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 67: Sun_Malloc
# Fix 68: Sun_Malloc
#
case "${file}" in ./malloc.h )
fixlist="${fixlist}
@ -2016,7 +2053,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 68: 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}`"
@ -2058,7 +2095,7 @@ extern int memcmp();\
#
# Fix 69: Sun_Rusers_Semi
# Fix 70: Sun_Rusers_Semi
#
case "${file}" in ./rpcsvc/rusers.h )
if ( test -n "`egrep '_cnt$' ${file}`"
@ -2079,7 +2116,7 @@ extern int memcmp();\
#
# Fix 70: Sun_Signal
# Fix 71: Sun_Signal
#
case "${file}" in ./sys/signal.h | \
./signal.h )
@ -2108,7 +2145,7 @@ void (*signal(...))(...);\
#
# Fix 71: Sun_Auth_Proto
# Fix 72: Sun_Auth_Proto
#
case "${file}" in ./rpc/auth.h | \
./rpc/clnt.h | \
@ -2141,7 +2178,7 @@ void (*signal(...))(...);\
#
# Fix 72: Sunos_Matherr_Decl
# Fix 73: Sunos_Matherr_Decl
#
case "${file}" in ./math.h )
fixlist="${fixlist}
@ -2162,7 +2199,7 @@ struct exception;
#
# Fix 73: Sunos_Strlen
# Fix 74: Sunos_Strlen
#
case "${file}" in ./strings.h )
fixlist="${fixlist}
@ -2180,7 +2217,7 @@ struct exception;
#
# Fix 74: Systypes
# Fix 75: Systypes
#
case "${file}" in ./sys/types.h | \
./stdlib.h | \
@ -2234,7 +2271,7 @@ typedef __SIZE_TYPE__ size_t;\
#
# Fix 75: 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 \
@ -2262,7 +2299,7 @@ typedef __SIZE_TYPE__ size_t;\
#
# Fix 76: Sysv68_String
# Fix 77: Sysv68_String
#
case "${file}" in ./string.h )
fixlist="${fixlist}
@ -2290,7 +2327,7 @@ extern unsigned int\
#
# Fix 77: Sysz_Stdlib_For_Sun
# Fix 78: Sysz_Stdlib_For_Sun
#
case "${file}" in ./stdlib.h )
case "$target_canonical" in *-sun* | \
@ -2324,7 +2361,7 @@ extern unsigned int\
#
# Fix 78: Sysz_Stdtypes_For_Sun
# Fix 79: Sysz_Stdtypes_For_Sun
#
case "${file}" in ./sys/stdtypes.h )
fixlist="${fixlist}
@ -2362,7 +2399,7 @@ extern unsigned int\
#
# Fix 79: Tinfo_Cplusplus
# Fix 80: Tinfo_Cplusplus
#
case "${file}" in ./tinfo.h )
fixlist="${fixlist}
@ -2380,7 +2417,7 @@ extern unsigned int\
#
# Fix 80: Ultrix_Ansi_Compat
# Fix 81: Ultrix_Ansi_Compat
#
case "${file}" in ./ansi_compat.h )
if ( test -n "`egrep 'ULTRIX' ${file}`"
@ -2404,7 +2441,7 @@ extern unsigned int\
#
# Fix 81: Ultrix_Fix_Fixproto
# Fix 82: Ultrix_Fix_Fixproto
#
case "${file}" in ./sys/utsname.h )
if ( test -n "`egrep 'ULTRIX' ${file}`"
@ -2427,7 +2464,7 @@ struct utsname;
#
# Fix 82: Ultrix_Atof_Param
# Fix 83: Ultrix_Atof_Param
#
case "${file}" in ./math.h )
fixlist="${fixlist}
@ -2449,7 +2486,7 @@ struct utsname;
#
# Fix 83: Ultrix_Const
# Fix 84: Ultrix_Const
#
case "${file}" in ./stdio.h )
fixlist="${fixlist}
@ -2475,7 +2512,7 @@ struct utsname;
#
# Fix 84: Ultrix_Ifdef
# Fix 85: Ultrix_Ifdef
#
case "${file}" in ./sys/file.h )
if ( test -n "`egrep '#ifdef KERNEL' ${file}`"
@ -2496,7 +2533,7 @@ struct utsname;
#
# Fix 85: Ultrix_Nested_Cmnt
# Fix 86: Ultrix_Nested_Cmnt
#
case "${file}" in ./rpc/svc.h )
fixlist="${fixlist}
@ -2514,7 +2551,7 @@ struct utsname;
#
# Fix 86: Ultrix_Static
# Fix 87: Ultrix_Static
#
case "${file}" in ./machine/cpu.h )
if ( test -n "`egrep '#include \"r[34]_cpu' ${file}`"
@ -2537,7 +2574,7 @@ struct utsname;
#
# Fix 87: Undefine_Null
# Fix 88: Undefine_Null
#
if ( test -n "`egrep '^#[ ]*define[ ]*[ ]NULL[ ]' ${file}`" -a \
-z "`egrep '#[ ]*(ifn|un)def[ ]*[ ]NULL($|[ ])' ${file}`"
@ -2558,7 +2595,7 @@ struct utsname;
#
# Fix 88: Va_I960_Macro
# Fix 89: Va_I960_Macro
#
case "${file}" in ./arch/i960/archI960.h )
if ( test -n "`egrep '__(vsiz|vali|vpad|alignof__)' ${file}`"
@ -2582,7 +2619,7 @@ struct utsname;
#
# Fix 89: Void_Null
# Fix 90: Void_Null
#
case "${file}" in ./curses.h | \
./dbm.h | \
@ -2613,7 +2650,7 @@ struct utsname;
#
# Fix 90: 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}`"
@ -2655,7 +2692,7 @@ struct utsname;
#
# Fix 91: Vxworks_Needs_Vxtypes
# Fix 92: Vxworks_Needs_Vxtypes
#
case "${file}" in ./time.h )
if ( test -n "`egrep 'uint_t[ ][ ]*_clocks_per_sec' ${file}`"
@ -2676,7 +2713,7 @@ struct utsname;
#
# Fix 92: Vxworks_Needs_Vxworks
# Fix 93: Vxworks_Needs_Vxworks
#
case "${file}" in ./sys/stat.h )
if ( test -n "`egrep '#[ ]define[ ][ ]*__INCstath' ${file}`" -a \
@ -2702,7 +2739,7 @@ struct utsname;
#
# Fix 93: Vxworks_Time
# Fix 94: Vxworks_Time
#
case "${file}" in ./time.h )
if ( test -n "`egrep 'VOIDFUNCPTR' ${file}`" -a \
@ -2734,7 +2771,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\
#
# Fix 94: X11_Class
# Fix 95: X11_Class
#
case "${file}" in ./X11/ShellP.h )
if ( test -z "`egrep '__cplusplus' ${file}`"
@ -2762,7 +2799,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\
#
# Fix 95: X11_Class_Usage
# Fix 96: X11_Class_Usage
#
case "${file}" in ./Xm/BaseClassI.h )
if ( test -z "`egrep '__cplusplus' ${file}`"
@ -2783,7 +2820,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\
#
# Fix 96: X11_New
# Fix 97: X11_New
#
case "${file}" in ./Xm/Traversal.h )
if ( test -z "`egrep '__cplusplus' ${file}`"
@ -2812,7 +2849,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\
#
# Fix 97: X11_Sprintf
# Fix 98: X11_Sprintf
#
case "${file}" in ./X11*/Xmu.h )
fixlist="${fixlist}
@ -2832,7 +2869,7 @@ extern char * sprintf();\
#
# Fix 98: 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}`"
@ -2859,7 +2896,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
#
# Fix 99: Zzz_Ki
# Fix 100: Zzz_Ki
#
case "${file}" in ./sys/ki.h )
if ( test -n "`egrep '11.00 HP-UX LP64' ${file}`"
@ -2886,7 +2923,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
#
# Fix 100: Zzz_Ki_Calls
# Fix 101: Zzz_Ki_Calls
#
case "${file}" in ./sys/ki_calls.h )
if ( test -n "`egrep 'kthread_create_caller_t' ${file}`"
@ -2913,7 +2950,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
#
# Fix 101: Zzz_Ki_Defs
# Fix 102: Zzz_Ki_Defs
#
case "${file}" in ./sys/ki_defs.h )
if ( test -n "`egrep 'Kernel Instrumentation Definitions' ${file}`"
@ -2940,7 +2977,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
#
# Fix 102: Zzz_Bad_Fixes
# Fix 103: Zzz_Bad_Fixes
#
case "${file}" in ./sundev/ipi_error.h )
fixlist="${fixlist}
@ -2964,7 +3001,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
#
# Fix 103: 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}`"