Skip to content

R
riscv-gcc-1
Commit f3e28ab4 by Bruce Korb
Options

Commit updates generated from def/tpl files 

From-SVN: r22545
parent 6096cf98
Showing with 232 additions and 459 deletions
contrib/fixinc/fixincl.sh
#!/bin/sh -p #!/bin/sh
# #
# DO NOT EDIT THIS FILE (fixincl.sh) # DO NOT EDIT THIS FILE (fixincl.sh)
# #
# It has been autogen-ed Tuesday June 02, 1998 at 06:46:41 AM PDT # It has been autogen-ed Tuesday September 22, 1998 at 07:22:35 AM PDT
# From the definitions inclhack.def # From the definitions inclhack.def
# and the template file inclhack.tpl # and the template file inclhack.tpl
# #
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
# files which are fixed to work correctly with ANSI C and placed in a # files which are fixed to work correctly with ANSI C and placed in a
# directory that GNU C will search. # directory that GNU C will search.
# #
# This script contains 108 fixup scripts. # This script contains 104 fixup scripts.
# #
# See README-fixinc for more information. # See README-fixinc for more information.
# #
......
contrib/fixinc/fixincl.x
/* /*
* DO NOT EDIT THIS FILE (fixincl.x) * DO NOT EDIT THIS FILE (fixincl.x)
* *
* It has been autogen-ed Wednesday September 9, 1998 at 04:44:05 PM PDT * It has been autogen-ed Tuesday September 22, 1998 at 07:22:34 AM PDT
* From the definitions inclhack.def * From the definitions inclhack.def
* and the template file fixincl.tpl * and the template file fixincl.tpl
* *
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
* files which are fixed to work correctly with ANSI C and placed in a * files which are fixed to work correctly with ANSI C and placed in a
* directory that GNU C will search. * directory that GNU C will search.
* *
* This script contains 108 fixup scripts. * This script contains 104 fixup scripts.
* *
* See README-fixinc for more information. * See README-fixinc for more information.
* *
...@@ -586,132 +586,72 @@ const char* apzBsd43_Io_MacrosPatch[] = { "sed", ...@@ -586,132 +586,72 @@ const char* apzBsd43_Io_MacrosPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 17 - Cxx_Cmnt_Hpux fix * Description 17 - No_Double_Slash fix
*/ */
tSCC zCxx_Cmnt_HpuxName[] = tSCC zNo_Double_SlashName[] =
"Cxx_Cmnt_Hpux"; "No_Double_Slash";
/*
* File name selection pattern
*/
tSCC zCxx_Cmnt_HpuxList[] =
"|" "sys/pci.h" "|";
/*
* Machine/OS name selection pattern
*/
#define apzCxx_Cmnt_HpuxMachs (const char**)NULL
/*
* content selection pattern
*/
tSCC zCxx_Cmnt_HpuxSelect0[] =
"System Private Structures";
#define CXX_CMNT_HPUX_TEST_CT 1
tTestDesc aCxx_Cmnt_HpuxTests[] = {
{ TT_EGREP, zCxx_Cmnt_HpuxSelect0, (regex_t*)NULL } };
/*
* Fix Command Arguments for Cxx_Cmnt_Hpux
*/
const char* apzCxx_Cmnt_HpuxPatch[] = { "sed",
"-e" "s|//.*$||g",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 18 - Cxx_Cmnt_Irix fix
*/
tSCC zCxx_Cmnt_IrixName[] =
"Cxx_Cmnt_Irix";
/* /*
* File name selection pattern * File name selection pattern
*/ */
tSCC zCxx_Cmnt_IrixList[] = #define zNo_Double_SlashList (char*)NULL
"|" "fam.h" "|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
#define apzCxx_Cmnt_IrixMachs (const char**)NULL #define apzNo_Double_SlashMachs (const char**)NULL
/* /*
* content selection pattern * content selection pattern
*/ */
tSCC zCxx_Cmnt_IrixSelect0[] = tSCC zNo_Double_SlashSelect0[] =
"indigo.esd"; "//[^*]";
#define CXX_CMNT_IRIX_TEST_CT 1
tTestDesc aCxx_Cmnt_IrixTests[] = {
{ TT_EGREP, zCxx_Cmnt_IrixSelect0, (regex_t*)NULL } };
/* /*
* Fix Command Arguments for Cxx_Cmnt_Irix * content test pattern. A shell will deal with it later.
*/ */
const char* apzCxx_Cmnt_IrixPatch[] = { "sed", tSCC zNo_Double_SlashTest0[] =
"-e" "s|//.*$||g", "-z \"`echo ${file}|egrep '++$|\\.hh$|\\.H$'`\"";
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * #define NO_DOUBLE_SLASH_TEST_CT 2
* tTestDesc aNo_Double_SlashTests[] = {
* Description 19 - Cxx_Cmnt_Sunos fix { TT_TEST, zNo_Double_SlashTest0, 0 /* unused */ },
*/ { TT_EGREP, zNo_Double_SlashSelect0, (regex_t*)NULL } };
tSCC zCxx_Cmnt_SunosName[] =
"Cxx_Cmnt_Sunos";
/*
* File name selection pattern
*/
tSCC zCxx_Cmnt_SunosList[] =
"|" "sbusdev/audiovar.h"
"|" "sys/audiovar.h" "|";
/*
* Machine/OS name selection pattern
*/
#define apzCxx_Cmnt_SunosMachs (const char**)NULL
#define CXX_CMNT_SUNOS_TEST_CT 0
#define aCxx_Cmnt_SunosTests (tTestDesc*)NULL
/* /*
* Fix Command Arguments for Cxx_Cmnt_Sunos * Fix Command Arguments for No_Double_Slash
*/ */
const char* apzCxx_Cmnt_SunosPatch[] = { "sed", const char* apzNo_Double_SlashPatch[] = { "sed",
"-e" "s|//.*$||g", "-e" "/\\/\\/[^*]/s|//.*$||g",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 20 - Cxx_Cmnt_Vxworks fix * Description 18 - Irix_Bogus_Cxx_Cmnt fix
*/ */
tSCC zCxx_Cmnt_VxworksName[] = tSCC zIrix_Bogus_Cxx_CmntName[] =
"Cxx_Cmnt_Vxworks"; "Irix_Bogus_Cxx_Cmnt";
/* /*
* File name selection pattern * File name selection pattern
*/ */
tSCC zCxx_Cmnt_VxworksList[] = tSCC zIrix_Bogus_Cxx_CmntList[] =
"|" "drv/netif/if_med.h" "|"; "|" "elf_abi.h"
"|" "elf.h" "|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
#define apzCxx_Cmnt_VxworksMachs (const char**)NULL #define apzIrix_Bogus_Cxx_CmntMachs (const char**)NULL
#define IRIX_BOGUS_CXX_CMNT_TEST_CT 0
/* #define aIrix_Bogus_Cxx_CmntTests (tTestDesc*)NULL
* content selection pattern
*/
tSCC zCxx_Cmnt_VxworksSelect0[] =
"Wind River";
#define CXX_CMNT_VXWORKS_TEST_CT 1
tTestDesc aCxx_Cmnt_VxworksTests[] = {
{ TT_EGREP, zCxx_Cmnt_VxworksSelect0, (regex_t*)NULL } };
/* /*
* Fix Command Arguments for Cxx_Cmnt_Vxworks * Fix Command Arguments for Irix_Bogus_Cxx_Cmnt
*/ */
const char* apzCxx_Cmnt_VxworksPatch[] = { "sed", const char* apzIrix_Bogus_Cxx_CmntPatch[] = { "sed",
"-e" "s|//.*$||g", "-e" "s@\"/\\*\"\\*/@\"//\"@",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 21 - Ecd_Cursor fix * Description 19 - Ecd_Cursor fix
*/ */
tSCC zEcd_CursorName[] = tSCC zEcd_CursorName[] =
"Ecd_Cursor"; "Ecd_Cursor";
...@@ -737,7 +677,7 @@ const char* apzEcd_CursorPatch[] = { "sed", ...@@ -737,7 +677,7 @@ const char* apzEcd_CursorPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 22 - Else_Label fix * Description 20 - Else_Label fix
*/ */
tSCC zElse_LabelName[] = tSCC zElse_LabelName[] =
"Else_Label"; "Else_Label";
...@@ -775,7 +715,7 @@ const char* apzElse_LabelPatch[] = { "sed", ...@@ -775,7 +715,7 @@ const char* apzElse_LabelPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 23 - Endif_Label fix * Description 21 - Endif_Label fix
*/ */
tSCC zEndif_LabelName[] = tSCC zEndif_LabelName[] =
"Endif_Label"; "Endif_Label";
...@@ -814,7 +754,7 @@ const char* apzEndif_LabelPatch[] = { "sed", ...@@ -814,7 +754,7 @@ const char* apzEndif_LabelPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 24 - Hp_Inline fix * Description 22 - Hp_Inline fix
*/ */
tSCC zHp_InlineName[] = tSCC zHp_InlineName[] =
"Hp_Inline"; "Hp_Inline";
...@@ -848,7 +788,7 @@ const char* apzHp_InlinePatch[] = { "sed", ...@@ -848,7 +788,7 @@ const char* apzHp_InlinePatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 25 - Hp_Sysfile fix * Description 23 - Hp_Sysfile fix
*/ */
tSCC zHp_SysfileName[] = tSCC zHp_SysfileName[] =
"Hp_Sysfile"; "Hp_Sysfile";
...@@ -881,7 +821,7 @@ const char* apzHp_SysfilePatch[] = { "sed", ...@@ -881,7 +821,7 @@ const char* apzHp_SysfilePatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 26 - Hpux_Cxx_Unready fix * Description 24 - Hpux_Cxx_Unready fix
*/ */
tSCC zHpux_Cxx_UnreadyName[] = tSCC zHpux_Cxx_UnreadyName[] =
"Hpux_Cxx_Unready"; "Hpux_Cxx_Unready";
...@@ -922,7 +862,7 @@ const char* apzHpux_Cxx_UnreadyPatch[] = { "sed", ...@@ -922,7 +862,7 @@ const char* apzHpux_Cxx_UnreadyPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 27 - Hpux_Maxint fix * Description 25 - Hpux_Maxint fix
*/ */
tSCC zHpux_MaxintName[] = tSCC zHpux_MaxintName[] =
"Hpux_Maxint"; "Hpux_Maxint";
...@@ -950,7 +890,7 @@ const char* apzHpux_MaxintPatch[] = { "sed", ...@@ -950,7 +890,7 @@ const char* apzHpux_MaxintPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 28 - Hpux_Systime fix * Description 26 - Hpux_Systime fix
*/ */
tSCC zHpux_SystimeName[] = tSCC zHpux_SystimeName[] =
"Hpux_Systime"; "Hpux_Systime";
...@@ -983,7 +923,7 @@ const char* apzHpux_SystimePatch[] = { "sed", ...@@ -983,7 +923,7 @@ const char* apzHpux_SystimePatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 29 - Interactv_Add1 fix * Description 27 - Interactv_Add1 fix
*/ */
tSCC zInteractv_Add1Name[] = tSCC zInteractv_Add1Name[] =
"Interactv_Add1"; "Interactv_Add1";
...@@ -1024,7 +964,7 @@ const char* apzInteractv_Add1Patch[] = { "sed", ...@@ -1024,7 +964,7 @@ const char* apzInteractv_Add1Patch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 30 - Interactv_Add2 fix * Description 28 - Interactv_Add2 fix
*/ */
tSCC zInteractv_Add2Name[] = tSCC zInteractv_Add2Name[] =
"Interactv_Add2"; "Interactv_Add2";
...@@ -1060,7 +1000,7 @@ const char* apzInteractv_Add2Patch[] = { "sed", ...@@ -1060,7 +1000,7 @@ const char* apzInteractv_Add2Patch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 31 - Interactv_Add3 fix * Description 29 - Interactv_Add3 fix
*/ */
tSCC zInteractv_Add3Name[] = tSCC zInteractv_Add3Name[] =
"Interactv_Add3"; "Interactv_Add3";
...@@ -1097,7 +1037,7 @@ const char* apzInteractv_Add3Patch[] = { "sed", ...@@ -1097,7 +1037,7 @@ const char* apzInteractv_Add3Patch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 32 - Io_Def_Quotes fix * Description 30 - Io_Def_Quotes fix
*/ */
tSCC zIo_Def_QuotesName[] = tSCC zIo_Def_QuotesName[] =
"Io_Def_Quotes"; "Io_Def_Quotes";
...@@ -1131,7 +1071,7 @@ const char* apzIo_Def_QuotesPatch[] = { "sed", ...@@ -1131,7 +1071,7 @@ const char* apzIo_Def_QuotesPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 33 - Ioctl_Fix_Ctrl fix * Description 31 - Ioctl_Fix_Ctrl fix
*/ */
tSCC zIoctl_Fix_CtrlName[] = tSCC zIoctl_Fix_CtrlName[] =
"Ioctl_Fix_Ctrl"; "Ioctl_Fix_Ctrl";
...@@ -1167,7 +1107,7 @@ const char* apzIoctl_Fix_CtrlPatch[] = { "sed", ...@@ -1167,7 +1107,7 @@ const char* apzIoctl_Fix_CtrlPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 34 - Ip_Missing_Semi fix * Description 32 - Ip_Missing_Semi fix
*/ */
tSCC zIp_Missing_SemiName[] = tSCC zIp_Missing_SemiName[] =
"Ip_Missing_Semi"; "Ip_Missing_Semi";
...@@ -1192,33 +1132,7 @@ const char* apzIp_Missing_SemiPatch[] = { "sed", ...@@ -1192,33 +1132,7 @@ const char* apzIp_Missing_SemiPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 35 - Irix_Bogus_Cxx_Cmnt fix * Description 33 - Irix_Multiline_Cmnt fix
*/
tSCC zIrix_Bogus_Cxx_CmntName[] =
"Irix_Bogus_Cxx_Cmnt";
/*
* File name selection pattern
*/
tSCC zIrix_Bogus_Cxx_CmntList[] =
"|" "elf_abi.h"
"|" "elf.h" "|";
/*
* Machine/OS name selection pattern
*/
#define apzIrix_Bogus_Cxx_CmntMachs (const char**)NULL
#define IRIX_BOGUS_CXX_CMNT_TEST_CT 0
#define aIrix_Bogus_Cxx_CmntTests (tTestDesc*)NULL
/*
* Fix Command Arguments for Irix_Bogus_Cxx_Cmnt
*/
const char* apzIrix_Bogus_Cxx_CmntPatch[] = { "sed",
"-e" "s@\"/\\*\"\\*/@\"//\"@",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 36 - Irix_Multiline_Cmnt fix
*/ */
tSCC zIrix_Multiline_CmntName[] = tSCC zIrix_Multiline_CmntName[] =
"Irix_Multiline_Cmnt"; "Irix_Multiline_Cmnt";
...@@ -1244,7 +1158,7 @@ const char* apzIrix_Multiline_CmntPatch[] = { "sed", ...@@ -1244,7 +1158,7 @@ const char* apzIrix_Multiline_CmntPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 37 - Irix_Sockaddr fix * Description 34 - Irix_Sockaddr fix
*/ */
tSCC zIrix_SockaddrName[] = tSCC zIrix_SockaddrName[] =
"Irix_Sockaddr"; "Irix_Sockaddr";
...@@ -1278,7 +1192,7 @@ const char* apzIrix_SockaddrPatch[] = { "sed", ...@@ -1278,7 +1192,7 @@ const char* apzIrix_SockaddrPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 38 - Irix_Struct__File fix * Description 35 - Irix_Struct__File fix
*/ */
tSCC zIrix_Struct__FileName[] = tSCC zIrix_Struct__FileName[] =
"Irix_Struct__File"; "Irix_Struct__File";
...@@ -1304,7 +1218,7 @@ const char* apzIrix_Struct__FilePatch[] = { "sed", ...@@ -1304,7 +1218,7 @@ const char* apzIrix_Struct__FilePatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 39 - Isc_Fmod fix * Description 36 - Isc_Fmod fix
*/ */
tSCC zIsc_FmodName[] = tSCC zIsc_FmodName[] =
"Isc_Fmod"; "Isc_Fmod";
...@@ -1337,7 +1251,7 @@ const char* apzIsc_FmodPatch[] = { "sed", ...@@ -1337,7 +1251,7 @@ const char* apzIsc_FmodPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 40 - Motorola_Nested fix * Description 37 - Motorola_Nested fix
*/ */
tSCC zMotorola_NestedName[] = tSCC zMotorola_NestedName[] =
"Motorola_Nested"; "Motorola_Nested";
...@@ -1364,7 +1278,7 @@ const char* apzMotorola_NestedPatch[] = { "sed", ...@@ -1364,7 +1278,7 @@ const char* apzMotorola_NestedPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 41 - Isc_Sys_Limits fix * Description 38 - Isc_Sys_Limits fix
*/ */
tSCC zIsc_Sys_LimitsName[] = tSCC zIsc_Sys_LimitsName[] =
"Isc_Sys_Limits"; "Isc_Sys_Limits";
...@@ -1398,7 +1312,7 @@ const char* apzIsc_Sys_LimitsPatch[] = { "sed", ...@@ -1398,7 +1312,7 @@ const char* apzIsc_Sys_LimitsPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 42 - Kandr_Concat fix * Description 39 - Kandr_Concat fix
*/ */
tSCC zKandr_ConcatName[] = tSCC zKandr_ConcatName[] =
"Kandr_Concat"; "Kandr_Concat";
...@@ -1448,7 +1362,7 @@ const char* apzKandr_ConcatPatch[] = { "sed", ...@@ -1448,7 +1362,7 @@ const char* apzKandr_ConcatPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 43 - Limits_Ifndefs fix * Description 40 - Limits_Ifndefs fix
*/ */
tSCC zLimits_IfndefsName[] = tSCC zLimits_IfndefsName[] =
"Limits_Ifndefs"; "Limits_Ifndefs";
...@@ -1505,7 +1419,7 @@ const char* apzLimits_IfndefsPatch[] = { "sed", ...@@ -1505,7 +1419,7 @@ const char* apzLimits_IfndefsPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 44 - Lynx_Void_Int fix * Description 41 - Lynx_Void_Int fix
*/ */
tSCC zLynx_Void_IntName[] = tSCC zLynx_Void_IntName[] =
"Lynx_Void_Int"; "Lynx_Void_Int";
...@@ -1538,7 +1452,7 @@ const char* apzLynx_Void_IntPatch[] = { "sed", ...@@ -1538,7 +1452,7 @@ const char* apzLynx_Void_IntPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 45 - Lynxos_Fcntl_Proto fix * Description 42 - Lynxos_Fcntl_Proto fix
*/ */
tSCC zLynxos_Fcntl_ProtoName[] = tSCC zLynxos_Fcntl_ProtoName[] =
"Lynxos_Fcntl_Proto"; "Lynxos_Fcntl_Proto";
...@@ -1563,7 +1477,7 @@ const char* apzLynxos_Fcntl_ProtoPatch[] = { "sed", ...@@ -1563,7 +1477,7 @@ const char* apzLynxos_Fcntl_ProtoPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 46 - M88k_Bad_Hypot_Opt fix * Description 43 - M88k_Bad_Hypot_Opt fix
*/ */
tSCC zM88k_Bad_Hypot_OptName[] = tSCC zM88k_Bad_Hypot_OptName[] =
"M88k_Bad_Hypot_Opt"; "M88k_Bad_Hypot_Opt";
...@@ -1603,7 +1517,7 @@ const char* apzM88k_Bad_Hypot_OptPatch[] = { "sed", ...@@ -1603,7 +1517,7 @@ const char* apzM88k_Bad_Hypot_OptPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 47 - M88k_Bad_S_If fix * Description 44 - M88k_Bad_S_If fix
*/ */
tSCC zM88k_Bad_S_IfName[] = tSCC zM88k_Bad_S_IfName[] =
"M88k_Bad_S_If"; "M88k_Bad_S_If";
...@@ -1639,7 +1553,7 @@ const char* apzM88k_Bad_S_IfPatch[] = { "sed", ...@@ -1639,7 +1553,7 @@ const char* apzM88k_Bad_S_IfPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 48 - M88k_Multi_Incl fix * Description 45 - M88k_Multi_Incl fix
*/ */
tSCC zM88k_Multi_InclName[] = tSCC zM88k_Multi_InclName[] =
"M88k_Multi_Incl"; "M88k_Multi_Incl";
...@@ -1682,7 +1596,7 @@ const char* apzM88k_Multi_InclPatch[] = { "sh", "-c", ...@@ -1682,7 +1596,7 @@ const char* apzM88k_Multi_InclPatch[] = { "sh", "-c",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 49 - Machine_Name fix * Description 46 - Machine_Name fix
*/ */
tSCC zMachine_NameName[] = tSCC zMachine_NameName[] =
"Machine_Name"; "Machine_Name";
...@@ -1748,7 +1662,7 @@ const char* apzMachine_NamePatch[] = { "sed", ...@@ -1748,7 +1662,7 @@ const char* apzMachine_NamePatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 50 - Math_Exception fix * Description 47 - Math_Exception fix
*/ */
tSCC zMath_ExceptionName[] = tSCC zMath_ExceptionName[] =
"Math_Exception"; "Math_Exception";
...@@ -1796,7 +1710,7 @@ const char* apzMath_ExceptionPatch[] = { "sed", ...@@ -1796,7 +1710,7 @@ const char* apzMath_ExceptionPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 51 - Math_Gcc_Ifndefs fix * Description 48 - Math_Gcc_Ifndefs fix
*/ */
tSCC zMath_Gcc_IfndefsName[] = tSCC zMath_Gcc_IfndefsName[] =
"Math_Gcc_Ifndefs"; "Math_Gcc_Ifndefs";
...@@ -1840,7 +1754,7 @@ const char* apzMath_Gcc_IfndefsPatch[] = { "sh", "-c", ...@@ -1840,7 +1754,7 @@ const char* apzMath_Gcc_IfndefsPatch[] = { "sh", "-c",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 52 - Motorola_Stupid_Opt fix * Description 49 - Motorola_Stupid_Opt fix
*/ */
tSCC zMotorola_Stupid_OptName[] = tSCC zMotorola_Stupid_OptName[] =
"Motorola_Stupid_Opt"; "Motorola_Stupid_Opt";
...@@ -1887,7 +1801,7 @@ const char* apzMotorola_Stupid_OptPatch[] = { "sed", ...@@ -1887,7 +1801,7 @@ const char* apzMotorola_Stupid_OptPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 53 - Nested_Comment fix * Description 50 - Nested_Comment fix
*/ */
tSCC zNested_CommentName[] = tSCC zNested_CommentName[] =
"Nested_Comment"; "Nested_Comment";
...@@ -1912,7 +1826,7 @@ const char* apzNested_CommentPatch[] = { "sed", ...@@ -1912,7 +1826,7 @@ const char* apzNested_CommentPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 54 - News_Os_Recursion fix * Description 51 - News_Os_Recursion fix
*/ */
tSCC zNews_Os_RecursionName[] = tSCC zNews_Os_RecursionName[] =
"News_Os_Recursion"; "News_Os_Recursion";
...@@ -1948,7 +1862,7 @@ const char* apzNews_Os_RecursionPatch[] = { "sed", ...@@ -1948,7 +1862,7 @@ const char* apzNews_Os_RecursionPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 55 - Next_Math_Prefix fix * Description 52 - Next_Math_Prefix fix
*/ */
tSCC zNext_Math_PrefixName[] = tSCC zNext_Math_PrefixName[] =
"Next_Math_Prefix"; "Next_Math_Prefix";
...@@ -1985,7 +1899,7 @@ const char* apzNext_Math_PrefixPatch[] = { "sed", ...@@ -1985,7 +1899,7 @@ const char* apzNext_Math_PrefixPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 56 - Next_Template fix * Description 53 - Next_Template fix
*/ */
tSCC zNext_TemplateName[] = tSCC zNext_TemplateName[] =
"Next_Template"; "Next_Template";
...@@ -2019,7 +1933,7 @@ const char* apzNext_TemplatePatch[] = { "sed", ...@@ -2019,7 +1933,7 @@ const char* apzNext_TemplatePatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 57 - Next_Volitile fix * Description 54 - Next_Volitile fix
*/ */
tSCC zNext_VolitileName[] = tSCC zNext_VolitileName[] =
"Next_Volitile"; "Next_Volitile";
...@@ -2053,7 +1967,7 @@ const char* apzNext_VolitilePatch[] = { "sed", ...@@ -2053,7 +1967,7 @@ const char* apzNext_VolitilePatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 58 - Next_Wait_Union fix * Description 55 - Next_Wait_Union fix
*/ */
tSCC zNext_Wait_UnionName[] = tSCC zNext_Wait_UnionName[] =
"Next_Wait_Union"; "Next_Wait_Union";
...@@ -2086,46 +2000,7 @@ const char* apzNext_Wait_UnionPatch[] = { "sed", ...@@ -2086,46 +2000,7 @@ const char* apzNext_Wait_UnionPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 59 - No_Double_Slash fix * Description 56 - Nodeent_Syntax fix
*/
tSCC zNo_Double_SlashName[] =
"No_Double_Slash";
/*
* File name selection pattern
*/
#define zNo_Double_SlashList (char*)NULL
/*
* Machine/OS name selection pattern
*/
#define apzNo_Double_SlashMachs (const char**)NULL
/*
* content selection pattern
*/
tSCC zNo_Double_SlashSelect0[] =
"//[^*]";
/*
* content test pattern. A shell will deal with it later.
*/
tSCC zNo_Double_SlashTest0[] =
"-z \"`echo ${file}|egrep '++|\\.hh$|\\.H$'`\"";
#define NO_DOUBLE_SLASH_TEST_CT 2
tTestDesc aNo_Double_SlashTests[] = {
{ TT_TEST, zNo_Double_SlashTest0, 0 /* unused */ },
{ TT_EGREP, zNo_Double_SlashSelect0, (regex_t*)NULL } };
/*
* Fix Command Arguments for No_Double_Slash
*/
const char* apzNo_Double_SlashPatch[] = { "sed",
"-e" "/\\/\\/[^*]/s|//\\(.*\\)$|/* \\1 */|",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 60 - Nodeent_Syntax fix
*/ */
tSCC zNodeent_SyntaxName[] = tSCC zNodeent_SyntaxName[] =
"Nodeent_Syntax"; "Nodeent_Syntax";
...@@ -2150,7 +2025,7 @@ const char* apzNodeent_SyntaxPatch[] = { "sed", ...@@ -2150,7 +2025,7 @@ const char* apzNodeent_SyntaxPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 61 - Osf_Namespace_A fix * Description 57 - Osf_Namespace_A fix
*/ */
tSCC zOsf_Namespace_AName[] = tSCC zOsf_Namespace_AName[] =
"Osf_Namespace_A"; "Osf_Namespace_A";
...@@ -2186,7 +2061,7 @@ const char* apzOsf_Namespace_APatch[] = { "sed", ...@@ -2186,7 +2061,7 @@ const char* apzOsf_Namespace_APatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 62 - Osf_Namespace_B fix * Description 58 - Osf_Namespace_B fix
*/ */
tSCC zOsf_Namespace_BName[] = tSCC zOsf_Namespace_BName[] =
"Osf_Namespace_B"; "Osf_Namespace_B";
...@@ -2222,7 +2097,7 @@ const char* apzOsf_Namespace_BPatch[] = { "sed", ...@@ -2222,7 +2097,7 @@ const char* apzOsf_Namespace_BPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 63 - Pthread_Page_Size fix * Description 59 - Pthread_Page_Size fix
*/ */
tSCC zPthread_Page_SizeName[] = tSCC zPthread_Page_SizeName[] =
"Pthread_Page_Size"; "Pthread_Page_Size";
...@@ -2255,7 +2130,7 @@ const char* apzPthread_Page_SizePatch[] = { "sed", ...@@ -2255,7 +2130,7 @@ const char* apzPthread_Page_SizePatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 64 - Rs6000_Double fix * Description 60 - Rs6000_Double fix
*/ */
tSCC zRs6000_DoubleName[] = tSCC zRs6000_DoubleName[] =
"Rs6000_Double"; "Rs6000_Double";
...@@ -2291,7 +2166,7 @@ const char* apzRs6000_DoublePatch[] = { "sed", ...@@ -2291,7 +2166,7 @@ const char* apzRs6000_DoublePatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 65 - Rs6000_Fchmod fix * Description 61 - Rs6000_Fchmod fix
*/ */
tSCC zRs6000_FchmodName[] = tSCC zRs6000_FchmodName[] =
"Rs6000_Fchmod"; "Rs6000_Fchmod";
...@@ -2324,7 +2199,7 @@ const char* apzRs6000_FchmodPatch[] = { "sed", ...@@ -2324,7 +2199,7 @@ const char* apzRs6000_FchmodPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 66 - Rs6000_Param fix * Description 62 - Rs6000_Param fix
*/ */
tSCC zRs6000_ParamName[] = tSCC zRs6000_ParamName[] =
"Rs6000_Param"; "Rs6000_Param";
...@@ -2350,7 +2225,7 @@ const char* apzRs6000_ParamPatch[] = { "sed", ...@@ -2350,7 +2225,7 @@ const char* apzRs6000_ParamPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 67 - Sony_Include fix * Description 63 - Sony_Include fix
*/ */
tSCC zSony_IncludeName[] = tSCC zSony_IncludeName[] =
"Sony_Include"; "Sony_Include";
...@@ -2383,7 +2258,7 @@ const char* apzSony_IncludePatch[] = { "sed", ...@@ -2383,7 +2258,7 @@ const char* apzSony_IncludePatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 68 - Statsswtch fix * Description 64 - Statsswtch fix
*/ */
tSCC zStatsswtchName[] = tSCC zStatsswtchName[] =
"Statsswtch"; "Statsswtch";
...@@ -2416,7 +2291,7 @@ const char* apzStatsswtchPatch[] = { "sed", ...@@ -2416,7 +2291,7 @@ const char* apzStatsswtchPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 69 - Stdio_Va_List fix * Description 65 - Stdio_Va_List fix
*/ */
tSCC zStdio_Va_ListName[] = tSCC zStdio_Va_ListName[] =
"Stdio_Va_List"; "Stdio_Va_List";
...@@ -2458,7 +2333,7 @@ const char* apzStdio_Va_ListPatch[] = { "sh", "-c", ...@@ -2458,7 +2333,7 @@ const char* apzStdio_Va_ListPatch[] = { "sh", "-c",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 70 - Sun_Bogus_Ifdef fix * Description 66 - Sun_Bogus_Ifdef fix
*/ */
tSCC zSun_Bogus_IfdefName[] = tSCC zSun_Bogus_IfdefName[] =
"Sun_Bogus_Ifdef"; "Sun_Bogus_Ifdef";
...@@ -2492,7 +2367,7 @@ const char* apzSun_Bogus_IfdefPatch[] = { "sed", ...@@ -2492,7 +2367,7 @@ const char* apzSun_Bogus_IfdefPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 71 - Sun_Bogus_Ifdef_Sun4c fix * Description 67 - Sun_Bogus_Ifdef_Sun4c fix
*/ */
tSCC zSun_Bogus_Ifdef_Sun4cName[] = tSCC zSun_Bogus_Ifdef_Sun4cName[] =
"Sun_Bogus_Ifdef_Sun4c"; "Sun_Bogus_Ifdef_Sun4c";
...@@ -2525,7 +2400,7 @@ const char* apzSun_Bogus_Ifdef_Sun4cPatch[] = { "sed", ...@@ -2525,7 +2400,7 @@ const char* apzSun_Bogus_Ifdef_Sun4cPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 72 - Sun_Catmacro fix * Description 68 - Sun_Catmacro fix
*/ */
tSCC zSun_CatmacroName[] = tSCC zSun_CatmacroName[] =
"Sun_Catmacro"; "Sun_Catmacro";
...@@ -2563,7 +2438,7 @@ const char* apzSun_CatmacroPatch[] = { "sed", ...@@ -2563,7 +2438,7 @@ const char* apzSun_CatmacroPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 73 - Sun_Malloc fix * Description 69 - Sun_Malloc fix
*/ */
tSCC zSun_MallocName[] = tSCC zSun_MallocName[] =
"Sun_Malloc"; "Sun_Malloc";
...@@ -2591,7 +2466,7 @@ const char* apzSun_MallocPatch[] = { "sed", ...@@ -2591,7 +2466,7 @@ const char* apzSun_MallocPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 74 - Sun_Memcpy fix * Description 70 - Sun_Memcpy fix
*/ */
tSCC zSun_MemcpyName[] = tSCC zSun_MemcpyName[] =
"Sun_Memcpy"; "Sun_Memcpy";
...@@ -2644,7 +2519,7 @@ const char* apzSun_MemcpyPatch[] = { "sed", ...@@ -2644,7 +2519,7 @@ const char* apzSun_MemcpyPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 75 - Sun_Rusers_Semi fix * Description 71 - Sun_Rusers_Semi fix
*/ */
tSCC zSun_Rusers_SemiName[] = tSCC zSun_Rusers_SemiName[] =
"Sun_Rusers_Semi"; "Sun_Rusers_Semi";
...@@ -2677,7 +2552,7 @@ const char* apzSun_Rusers_SemiPatch[] = { "sed", ...@@ -2677,7 +2552,7 @@ const char* apzSun_Rusers_SemiPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 76 - Sun_Signal fix * Description 72 - Sun_Signal fix
*/ */
tSCC zSun_SignalName[] = tSCC zSun_SignalName[] =
"Sun_Signal"; "Sun_Signal";
...@@ -2716,7 +2591,7 @@ const char* apzSun_SignalPatch[] = { "sed", ...@@ -2716,7 +2591,7 @@ const char* apzSun_SignalPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 77 - Sun_Xdr_Proto fix * Description 73 - Sun_Xdr_Proto fix
*/ */
tSCC zSun_Xdr_ProtoName[] = tSCC zSun_Xdr_ProtoName[] =
"Sun_Xdr_Proto"; "Sun_Xdr_Proto";
...@@ -2746,7 +2621,7 @@ const char* apzSun_Xdr_ProtoPatch[] = { "sed", ...@@ -2746,7 +2621,7 @@ const char* apzSun_Xdr_ProtoPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 78 - Sunos_Large_Macro fix * Description 74 - Sunos_Large_Macro fix
*/ */
tSCC zSunos_Large_MacroName[] = tSCC zSunos_Large_MacroName[] =
"Sunos_Large_Macro"; "Sunos_Large_Macro";
...@@ -2773,7 +2648,7 @@ const char* apzSunos_Large_MacroPatch[] = { "sh", "-c", ...@@ -2773,7 +2648,7 @@ const char* apzSunos_Large_MacroPatch[] = { "sh", "-c",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 79 - Sunos_Matherr_Decl fix * Description 75 - Sunos_Matherr_Decl fix
*/ */
tSCC zSunos_Matherr_DeclName[] = tSCC zSunos_Matherr_DeclName[] =
"Sunos_Matherr_Decl"; "Sunos_Matherr_Decl";
...@@ -2807,7 +2682,7 @@ const char* apzSunos_Matherr_DeclPatch[] = { "sed", ...@@ -2807,7 +2682,7 @@ const char* apzSunos_Matherr_DeclPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 80 - Sunos_Strlen fix * Description 76 - Sunos_Strlen fix
*/ */
tSCC zSunos_StrlenName[] = tSCC zSunos_StrlenName[] =
"Sunos_Strlen"; "Sunos_Strlen";
...@@ -2832,7 +2707,7 @@ const char* apzSunos_StrlenPatch[] = { "sed", ...@@ -2832,7 +2707,7 @@ const char* apzSunos_StrlenPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 81 - Systypes fix * Description 77 - Systypes fix
*/ */
tSCC zSystypesName[] = tSCC zSystypesName[] =
"Systypes"; "Systypes";
...@@ -2865,7 +2740,7 @@ tTestDesc aSystypesTests[] = { ...@@ -2865,7 +2740,7 @@ tTestDesc aSystypesTests[] = {
* Fix Command Arguments for Systypes * Fix Command Arguments for Systypes
*/ */
const char* apzSystypesPatch[] = { "sed", const char* apzSystypesPatch[] = { "sed",
"-e" "/^[ \t]**[ \t]*typedef unsigned int size_t;/N", "-e" "/^[ \t]*\\*[ \t]*typedef unsigned int size_t;/N",
"-e" "s/^\\([ \t]*\\*[ \t]*typedef unsigned int size_t;\\n[ \t]*\\*\\/\\)/\\1\\\n" "-e" "s/^\\([ \t]*\\*[ \t]*typedef unsigned int size_t;\\n[ \t]*\\*\\/\\)/\\1\\\n"
"#ifndef __SIZE_TYPE__\\\n" "#ifndef __SIZE_TYPE__\\\n"
"#define __SIZE_TYPE__ long unsigned int\\\n" "#define __SIZE_TYPE__ long unsigned int\\\n"
...@@ -2894,7 +2769,7 @@ const char* apzSystypesPatch[] = { "sed", ...@@ -2894,7 +2769,7 @@ const char* apzSystypesPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 82 - Systypes_For_Aix fix * Description 78 - Systypes_For_Aix fix
*/ */
tSCC zSystypes_For_AixName[] = tSCC zSystypes_For_AixName[] =
"Systypes_For_Aix"; "Systypes_For_Aix";
...@@ -2938,7 +2813,7 @@ const char* apzSystypes_For_AixPatch[] = { "sed", ...@@ -2938,7 +2813,7 @@ const char* apzSystypes_For_AixPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 83 - Sysv68_String fix * Description 79 - Sysv68_String fix
*/ */
tSCC zSysv68_StringName[] = tSCC zSysv68_StringName[] =
"Sysv68_String"; "Sysv68_String";
...@@ -2973,7 +2848,7 @@ const char* apzSysv68_StringPatch[] = { "sed", ...@@ -2973,7 +2848,7 @@ const char* apzSysv68_StringPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 84 - Sysz_Stdlib_For_Sun fix * Description 80 - Sysz_Stdlib_For_Sun fix
*/ */
tSCC zSysz_Stdlib_For_SunName[] = tSCC zSysz_Stdlib_For_SunName[] =
"Sysz_Stdlib_For_Sun"; "Sysz_Stdlib_For_Sun";
...@@ -3011,7 +2886,7 @@ const char* apzSysz_Stdlib_For_SunPatch[] = { "sed", ...@@ -3011,7 +2886,7 @@ const char* apzSysz_Stdlib_For_SunPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 85 - Sysz_Stdtypes_For_Sun fix * Description 81 - Sysz_Stdtypes_For_Sun fix
*/ */
tSCC zSysz_Stdtypes_For_SunName[] = tSCC zSysz_Stdtypes_For_SunName[] =
"Sysz_Stdtypes_For_Sun"; "Sysz_Stdtypes_For_Sun";
...@@ -3050,7 +2925,7 @@ const char* apzSysz_Stdtypes_For_SunPatch[] = { "sed", ...@@ -3050,7 +2925,7 @@ const char* apzSysz_Stdtypes_For_SunPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 86 - Tinfo_Cplusplus fix * Description 82 - Tinfo_Cplusplus fix
*/ */
tSCC zTinfo_CplusplusName[] = tSCC zTinfo_CplusplusName[] =
"Tinfo_Cplusplus"; "Tinfo_Cplusplus";
...@@ -3075,7 +2950,7 @@ const char* apzTinfo_CplusplusPatch[] = { "sed", ...@@ -3075,7 +2950,7 @@ const char* apzTinfo_CplusplusPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 87 - Ultrix_Ansi_Compat fix * Description 83 - Ultrix_Ansi_Compat fix
*/ */
tSCC zUltrix_Ansi_CompatName[] = tSCC zUltrix_Ansi_CompatName[] =
"Ultrix_Ansi_Compat"; "Ultrix_Ansi_Compat";
...@@ -3110,7 +2985,7 @@ const char* apzUltrix_Ansi_CompatPatch[] = { "sed", ...@@ -3110,7 +2985,7 @@ const char* apzUltrix_Ansi_CompatPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 88 - Ultrix_Atof_Param fix * Description 84 - Ultrix_Atof_Param fix
*/ */
tSCC zUltrix_Atof_ParamName[] = tSCC zUltrix_Atof_ParamName[] =
"Ultrix_Atof_Param"; "Ultrix_Atof_Param";
...@@ -3139,7 +3014,7 @@ const char* apzUltrix_Atof_ParamPatch[] = { "sed", ...@@ -3139,7 +3014,7 @@ const char* apzUltrix_Atof_ParamPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 89 - Ultrix_Const fix * Description 85 - Ultrix_Const fix
*/ */
tSCC zUltrix_ConstName[] = tSCC zUltrix_ConstName[] =
"Ultrix_Const"; "Ultrix_Const";
...@@ -3172,7 +3047,7 @@ const char* apzUltrix_ConstPatch[] = { "sed", ...@@ -3172,7 +3047,7 @@ const char* apzUltrix_ConstPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 90 - Ultrix_Ifdef fix * Description 86 - Ultrix_Ifdef fix
*/ */
tSCC zUltrix_IfdefName[] = tSCC zUltrix_IfdefName[] =
"Ultrix_Ifdef"; "Ultrix_Ifdef";
...@@ -3205,7 +3080,7 @@ const char* apzUltrix_IfdefPatch[] = { "sed", ...@@ -3205,7 +3080,7 @@ const char* apzUltrix_IfdefPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 91 - Ultrix_Nested_Cmnt fix * Description 87 - Ultrix_Nested_Cmnt fix
*/ */
tSCC zUltrix_Nested_CmntName[] = tSCC zUltrix_Nested_CmntName[] =
"Ultrix_Nested_Cmnt"; "Ultrix_Nested_Cmnt";
...@@ -3230,7 +3105,7 @@ const char* apzUltrix_Nested_CmntPatch[] = { "sed", ...@@ -3230,7 +3105,7 @@ const char* apzUltrix_Nested_CmntPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 92 - Ultrix_Static fix * Description 88 - Ultrix_Static fix
*/ */
tSCC zUltrix_StaticName[] = tSCC zUltrix_StaticName[] =
"Ultrix_Static"; "Ultrix_Static";
...@@ -3265,7 +3140,7 @@ const char* apzUltrix_StaticPatch[] = { "sed", ...@@ -3265,7 +3140,7 @@ const char* apzUltrix_StaticPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 93 - Undefine_Null fix * Description 89 - Undefine_Null fix
*/ */
tSCC zUndefine_NullName[] = tSCC zUndefine_NullName[] =
"Undefine_Null"; "Undefine_Null";
...@@ -3305,7 +3180,7 @@ const char* apzUndefine_NullPatch[] = { "sed", ...@@ -3305,7 +3180,7 @@ const char* apzUndefine_NullPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 94 - Va_I960_Macro fix * Description 90 - Va_I960_Macro fix
*/ */
tSCC zVa_I960_MacroName[] = tSCC zVa_I960_MacroName[] =
"Va_I960_Macro"; "Va_I960_Macro";
...@@ -3341,7 +3216,7 @@ const char* apzVa_I960_MacroPatch[] = { "sed", ...@@ -3341,7 +3216,7 @@ const char* apzVa_I960_MacroPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 95 - Void_Null fix * Description 91 - Void_Null fix
*/ */
tSCC zVoid_NullName[] = tSCC zVoid_NullName[] =
"Void_Null"; "Void_Null";
...@@ -3384,7 +3259,7 @@ const char* apzVoid_NullPatch[] = { "sed", ...@@ -3384,7 +3259,7 @@ const char* apzVoid_NullPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 96 - Vxworks_Gcc_Problem fix * Description 92 - Vxworks_Gcc_Problem fix
*/ */
tSCC zVxworks_Gcc_ProblemName[] = tSCC zVxworks_Gcc_ProblemName[] =
"Vxworks_Gcc_Problem"; "Vxworks_Gcc_Problem";
...@@ -3432,7 +3307,7 @@ const char* apzVxworks_Gcc_ProblemPatch[] = { "sed", ...@@ -3432,7 +3307,7 @@ const char* apzVxworks_Gcc_ProblemPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 97 - Vxworks_Needs_Vxtypes fix * Description 93 - Vxworks_Needs_Vxtypes fix
*/ */
tSCC zVxworks_Needs_VxtypesName[] = tSCC zVxworks_Needs_VxtypesName[] =
"Vxworks_Needs_Vxtypes"; "Vxworks_Needs_Vxtypes";
...@@ -3465,7 +3340,7 @@ const char* apzVxworks_Needs_VxtypesPatch[] = { "sed", ...@@ -3465,7 +3340,7 @@ const char* apzVxworks_Needs_VxtypesPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 98 - Vxworks_Needs_Vxworks fix * Description 94 - Vxworks_Needs_Vxworks fix
*/ */
tSCC zVxworks_Needs_VxworksName[] = tSCC zVxworks_Needs_VxworksName[] =
"Vxworks_Needs_Vxworks"; "Vxworks_Needs_Vxworks";
...@@ -3512,7 +3387,7 @@ const char* apzVxworks_Needs_VxworksPatch[] = { "sed", ...@@ -3512,7 +3387,7 @@ const char* apzVxworks_Needs_VxworksPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 99 - Vxworks_Time fix * Description 95 - Vxworks_Time fix
*/ */
tSCC zVxworks_TimeName[] = tSCC zVxworks_TimeName[] =
"Vxworks_Time"; "Vxworks_Time";
...@@ -3561,7 +3436,7 @@ const char* apzVxworks_TimePatch[] = { "sed", ...@@ -3561,7 +3436,7 @@ const char* apzVxworks_TimePatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 100 - X11_Class fix * Description 96 - X11_Class fix
*/ */
tSCC zX11_ClassName[] = tSCC zX11_ClassName[] =
"X11_Class"; "X11_Class";
...@@ -3599,7 +3474,7 @@ const char* apzX11_ClassPatch[] = { "sed", ...@@ -3599,7 +3474,7 @@ const char* apzX11_ClassPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 101 - X11_Class_Usage fix * Description 97 - X11_Class_Usage fix
*/ */
tSCC zX11_Class_UsageName[] = tSCC zX11_Class_UsageName[] =
"X11_Class_Usage"; "X11_Class_Usage";
...@@ -3632,7 +3507,7 @@ const char* apzX11_Class_UsagePatch[] = { "sed", ...@@ -3632,7 +3507,7 @@ const char* apzX11_Class_UsagePatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 102 - X11_New fix * Description 98 - X11_New fix
*/ */
tSCC zX11_NewName[] = tSCC zX11_NewName[] =
"X11_New"; "X11_New";
...@@ -3671,7 +3546,7 @@ const char* apzX11_NewPatch[] = { "sed", ...@@ -3671,7 +3546,7 @@ const char* apzX11_NewPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 103 - X11_Sprintf fix * Description 99 - X11_Sprintf fix
*/ */
tSCC zX11_SprintfName[] = tSCC zX11_SprintfName[] =
"X11_Sprintf"; "X11_Sprintf";
...@@ -3698,7 +3573,7 @@ const char* apzX11_SprintfPatch[] = { "sed", ...@@ -3698,7 +3573,7 @@ const char* apzX11_SprintfPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 104 - Zzz_Ki_Iface fix * Description 100 - Zzz_Ki_Iface fix
*/ */
tSCC zZzz_Ki_IfaceName[] = tSCC zZzz_Ki_IfaceName[] =
"Zzz_Ki_Iface"; "Zzz_Ki_Iface";
...@@ -3733,7 +3608,7 @@ const char* apzZzz_Ki_IfacePatch[] = { "sh", "-c", ...@@ -3733,7 +3608,7 @@ const char* apzZzz_Ki_IfacePatch[] = { "sh", "-c",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 105 - Zzz_Ki fix * Description 101 - Zzz_Ki fix
*/ */
tSCC zZzz_KiName[] = tSCC zZzz_KiName[] =
"Zzz_Ki"; "Zzz_Ki";
...@@ -3768,7 +3643,7 @@ const char* apzZzz_KiPatch[] = { "sh", "-c", ...@@ -3768,7 +3643,7 @@ const char* apzZzz_KiPatch[] = { "sh", "-c",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 106 - Zzz_Ki_Calls fix * Description 102 - Zzz_Ki_Calls fix
*/ */
tSCC zZzz_Ki_CallsName[] = tSCC zZzz_Ki_CallsName[] =
"Zzz_Ki_Calls"; "Zzz_Ki_Calls";
...@@ -3803,7 +3678,7 @@ const char* apzZzz_Ki_CallsPatch[] = { "sh", "-c", ...@@ -3803,7 +3678,7 @@ const char* apzZzz_Ki_CallsPatch[] = { "sh", "-c",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 107 - Zzz_Ki_Defs fix * Description 103 - Zzz_Ki_Defs fix
*/ */
tSCC zZzz_Ki_DefsName[] = tSCC zZzz_Ki_DefsName[] =
"Zzz_Ki_Defs"; "Zzz_Ki_Defs";
...@@ -3838,7 +3713,7 @@ const char* apzZzz_Ki_DefsPatch[] = { "sh", "-c", ...@@ -3838,7 +3713,7 @@ const char* apzZzz_Ki_DefsPatch[] = { "sh", "-c",
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description 108 - Zzz_Time fix * Description 104 - Zzz_Time fix
*/ */
tSCC zZzz_TimeName[] = tSCC zZzz_TimeName[] =
"Zzz_Time"; "Zzz_Time";
...@@ -3875,9 +3750,9 @@ const char* apzZzz_TimePatch[] = { "sh", "-c", ...@@ -3875,9 +3750,9 @@ const char* apzZzz_TimePatch[] = { "sh", "-c",
* *
* List of all fixes * List of all fixes
*/ */
#define REGEX_COUNT 76 #define REGEX_COUNT 73
#define FIX_COUNT 108 #define FIX_COUNT 104
tFixDesc fixDescList[ 108 ] = { tFixDesc fixDescList[ 104 ] = {
{ zAix_SyswaitName, zAix_SyswaitList, { zAix_SyswaitName, zAix_SyswaitList,
apzAix_SyswaitMachs, (regex_t*)NULL, apzAix_SyswaitMachs, (regex_t*)NULL,
AIX_SYSWAIT_TEST_CT, FD_MACH_ONLY, AIX_SYSWAIT_TEST_CT, FD_MACH_ONLY,
...@@ -3958,25 +3833,15 @@ tFixDesc fixDescList[ 108 ] = { ...@@ -3958,25 +3833,15 @@ tFixDesc fixDescList[ 108 ] = {
BSD43_IO_MACROS_TEST_CT, FD_MACH_ONLY, BSD43_IO_MACROS_TEST_CT, FD_MACH_ONLY,
aBsd43_Io_MacrosTests, apzBsd43_Io_MacrosPatch }, aBsd43_Io_MacrosTests, apzBsd43_Io_MacrosPatch },
{ zCxx_Cmnt_HpuxName, zCxx_Cmnt_HpuxList, { zNo_Double_SlashName, zNo_Double_SlashList,
apzCxx_Cmnt_HpuxMachs, (regex_t*)NULL, apzNo_Double_SlashMachs, (regex_t*)NULL,
CXX_CMNT_HPUX_TEST_CT, FD_MACH_ONLY, NO_DOUBLE_SLASH_TEST_CT, FD_MACH_ONLY,
aCxx_Cmnt_HpuxTests, apzCxx_Cmnt_HpuxPatch }, aNo_Double_SlashTests, apzNo_Double_SlashPatch },
{ zCxx_Cmnt_IrixName, zCxx_Cmnt_IrixList,
apzCxx_Cmnt_IrixMachs, (regex_t*)NULL,
CXX_CMNT_IRIX_TEST_CT, FD_MACH_ONLY,
aCxx_Cmnt_IrixTests, apzCxx_Cmnt_IrixPatch },
{ zCxx_Cmnt_SunosName, zCxx_Cmnt_SunosList,
apzCxx_Cmnt_SunosMachs, (regex_t*)NULL,
CXX_CMNT_SUNOS_TEST_CT, FD_MACH_ONLY,
aCxx_Cmnt_SunosTests, apzCxx_Cmnt_SunosPatch },
{ zCxx_Cmnt_VxworksName, zCxx_Cmnt_VxworksList, { zIrix_Bogus_Cxx_CmntName, zIrix_Bogus_Cxx_CmntList,
apzCxx_Cmnt_VxworksMachs, (regex_t*)NULL, apzIrix_Bogus_Cxx_CmntMachs, (regex_t*)NULL,
CXX_CMNT_VXWORKS_TEST_CT, FD_MACH_ONLY, IRIX_BOGUS_CXX_CMNT_TEST_CT, FD_MACH_ONLY,
aCxx_Cmnt_VxworksTests, apzCxx_Cmnt_VxworksPatch }, aIrix_Bogus_Cxx_CmntTests, apzIrix_Bogus_Cxx_CmntPatch },
{ zEcd_CursorName, zEcd_CursorList, { zEcd_CursorName, zEcd_CursorList,
apzEcd_CursorMachs, (regex_t*)NULL, apzEcd_CursorMachs, (regex_t*)NULL,
...@@ -4048,11 +3913,6 @@ tFixDesc fixDescList[ 108 ] = { ...@@ -4048,11 +3913,6 @@ tFixDesc fixDescList[ 108 ] = {
IP_MISSING_SEMI_TEST_CT, FD_MACH_ONLY, IP_MISSING_SEMI_TEST_CT, FD_MACH_ONLY,
aIp_Missing_SemiTests, apzIp_Missing_SemiPatch }, aIp_Missing_SemiTests, apzIp_Missing_SemiPatch },
{ zIrix_Bogus_Cxx_CmntName, zIrix_Bogus_Cxx_CmntList,
apzIrix_Bogus_Cxx_CmntMachs, (regex_t*)NULL,
IRIX_BOGUS_CXX_CMNT_TEST_CT, FD_MACH_ONLY,
aIrix_Bogus_Cxx_CmntTests, apzIrix_Bogus_Cxx_CmntPatch },
{ zIrix_Multiline_CmntName, zIrix_Multiline_CmntList, { zIrix_Multiline_CmntName, zIrix_Multiline_CmntList,
apzIrix_Multiline_CmntMachs, (regex_t*)NULL, apzIrix_Multiline_CmntMachs, (regex_t*)NULL,
IRIX_MULTILINE_CMNT_TEST_CT, FD_MACH_ONLY, IRIX_MULTILINE_CMNT_TEST_CT, FD_MACH_ONLY,
...@@ -4168,11 +4028,6 @@ tFixDesc fixDescList[ 108 ] = { ...@@ -4168,11 +4028,6 @@ tFixDesc fixDescList[ 108 ] = {
NEXT_WAIT_UNION_TEST_CT, FD_MACH_ONLY, NEXT_WAIT_UNION_TEST_CT, FD_MACH_ONLY,
aNext_Wait_UnionTests, apzNext_Wait_UnionPatch }, aNext_Wait_UnionTests, apzNext_Wait_UnionPatch },
{ zNo_Double_SlashName, zNo_Double_SlashList,
apzNo_Double_SlashMachs, (regex_t*)NULL,
NO_DOUBLE_SLASH_TEST_CT, FD_MACH_ONLY,
aNo_Double_SlashTests, apzNo_Double_SlashPatch },
{ zNodeent_SyntaxName, zNodeent_SyntaxList, { zNodeent_SyntaxName, zNodeent_SyntaxList,
apzNodeent_SyntaxMachs, (regex_t*)NULL, apzNodeent_SyntaxMachs, (regex_t*)NULL,
NODEENT_SYNTAX_TEST_CT, FD_MACH_ONLY, NODEENT_SYNTAX_TEST_CT, FD_MACH_ONLY,
......
contrib/fixinc/inclhack.sh
#!/bin/sh -p #!/bin/sh
# #
# DO NOT EDIT THIS FILE (inclhack.sh) # DO NOT EDIT THIS FILE (inclhack.sh)
# #
# It has been autogen-ed Wednesday September 9, 1998 at 04:44:05 PM PDT # It has been autogen-ed Tuesday September 22, 1998 at 07:22:34 AM PDT
# From the definitions inclhack.def # From the definitions inclhack.def
# and the template file inclhack.tpl # and the template file inclhack.tpl
# #
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
# files which are fixed to work correctly with ANSI C and placed in a # files which are fixed to work correctly with ANSI C and placed in a
# directory that GNU C will search. # directory that GNU C will search.
# #
# This script contains 108 fixup scripts. # This script contains 104 fixup scripts.
# #
# See README-fixinc for more information. # See README-fixinc for more information.
# #
...@@ -697,89 +697,45 @@ extern "C" {\ ...@@ -697,89 +697,45 @@ extern "C" {\
# #
# Fix 17: Cxx_Cmnt_Hpux # Fix 17: No_Double_Slash
# #
case "$file" in ./sys/pci.h ) if ( test -n "`egrep '//[^*]' $file`" -a \
if ( test -n "`egrep 'System Private Structures' $file`" '(' -z "`echo ${file}|egrep '++$|\.hh$|\.H$'`" ')'
) > /dev/null 2>&1 ; then ) > /dev/null 2>&1 ; then
fixlist="${fixlist} fixlist="${fixlist}
cxx_cmnt_hpux" no_double_slash"
if [ ! -r ${DESTDIR}/$file ] if [ ! -r ${DESTDIR}/$file ]
then infile=$file then infile=$file
else infile=${DESTDIR}/$file ; fi else infile=${DESTDIR}/$file ; fi
sed -e 's|//.*$||g' \ sed -e '/\/\/[^*]/s|//.*$||g' \
< $infile > ${DESTDIR}/$file. < $infile > ${DESTDIR}/$file.
mv -f ${DESTDIR}/$file. ${DESTDIR}/$file mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
fi # end of selection 'if' fi # end of selection 'if'
;; # case end for file name test
esac
# #
# Fix 18: Cxx_Cmnt_Irix # Fix 18: Irix_Bogus_Cxx_Cmnt
#
case "$file" in ./fam.h )
if ( test -n "`egrep 'indigo.esd' $file`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
cxx_cmnt_irix"
if [ ! -r ${DESTDIR}/$file ]
then infile=$file
else infile=${DESTDIR}/$file ; fi
sed -e 's|//.*$||g' \
< $infile > ${DESTDIR}/$file.
mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
fi # end of selection 'if'
;; # case end for file name test
esac
# #
# Fix 19: Cxx_Cmnt_Sunos case "$file" in ./elf_abi.h | \
# ./elf.h )
case "$file" in ./sbusdev/audiovar.h | \
./sys/audiovar.h )
fixlist="${fixlist}
cxx_cmnt_sunos"
if [ ! -r ${DESTDIR}/$file ]
then infile=$file
else infile=${DESTDIR}/$file ; fi
sed -e 's|//.*$||g' \
< $infile > ${DESTDIR}/$file.
mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
;; # case end for file name test
esac
#
# Fix 20: Cxx_Cmnt_Vxworks
#
case "$file" in ./drv/netif/if_med.h )
if ( test -n "`egrep 'Wind River' $file`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist} fixlist="${fixlist}
cxx_cmnt_vxworks" irix_bogus_cxx_cmnt"
if [ ! -r ${DESTDIR}/$file ] if [ ! -r ${DESTDIR}/$file ]
then infile=$file then infile=$file
else infile=${DESTDIR}/$file ; fi else infile=${DESTDIR}/$file ; fi
sed -e 's|//.*$||g' \ sed -e 's@"/\*"\*/@"//"@' \
< $infile > ${DESTDIR}/$file. < $infile > ${DESTDIR}/$file.
mv -f ${DESTDIR}/$file. ${DESTDIR}/$file mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
fi # end of selection 'if'
;; # case end for file name test ;; # case end for file name test
esac esac
# #
# Fix 21: Ecd_Cursor # Fix 19: Ecd_Cursor
# #
case "$file" in ./sunwindow/win_lock.h | \ case "$file" in ./sunwindow/win_lock.h | \
./sunwindow/win_cursor.h ) ./sunwindow/win_cursor.h )
...@@ -798,7 +754,7 @@ extern "C" {\ ...@@ -798,7 +754,7 @@ extern "C" {\
# #
# Fix 22: Else_Label # Fix 20: Else_Label
# #
if ( test -n "`egrep '^[ ]*#[ ]*else[ ]+[!-.0-~]' $file`" if ( test -n "`egrep '^[ ]*#[ ]*else[ ]+[!-.0-~]' $file`"
) > /dev/null 2>&1 ; then ) > /dev/null 2>&1 ; then
...@@ -822,7 +778,7 @@ s%^\([ ]*#[ ]*else\)[ ]*[^/ ].*%\1%' \ ...@@ -822,7 +778,7 @@ s%^\([ ]*#[ ]*else\)[ ]*[^/ ].*%\1%' \
# #
# Fix 23: Endif_Label # Fix 21: Endif_Label
# #
if ( test -n "`egrep '^[ ]*#[ ]*endif[ ]+[!-.0-z{|}~]' $file`" if ( test -n "`egrep '^[ ]*#[ ]*endif[ ]+[!-.0-z{|}~]' $file`"
) > /dev/null 2>&1 ; then ) > /dev/null 2>&1 ; then
...@@ -847,7 +803,7 @@ s%^\([ ]*#[ ]*endif\)[ ]*[^/* ].*%\1%' \ ...@@ -847,7 +803,7 @@ s%^\([ ]*#[ ]*endif\)[ ]*[^/* ].*%\1%' \
# #
# Fix 24: Hp_Inline # Fix 22: Hp_Inline
# #
case "$file" in ./sys/spinlock.h ) case "$file" in ./sys/spinlock.h )
if ( test -n "`egrep 'include.*\"\\.\\./machine/' $file`" if ( test -n "`egrep 'include.*\"\\.\\./machine/' $file`"
...@@ -869,7 +825,7 @@ s%^\([ ]*#[ ]*endif\)[ ]*[^/* ].*%\1%' \ ...@@ -869,7 +825,7 @@ s%^\([ ]*#[ ]*endif\)[ ]*[^/* ].*%\1%' \
# #
# Fix 25: Hp_Sysfile # Fix 23: Hp_Sysfile
# #
case "$file" in ./sys/file.h ) case "$file" in ./sys/file.h )
if ( test -n "`egrep 'HPUX_SOURCE' $file`" if ( test -n "`egrep 'HPUX_SOURCE' $file`"
...@@ -890,7 +846,7 @@ s%^\([ ]*#[ ]*endif\)[ ]*[^/* ].*%\1%' \ ...@@ -890,7 +846,7 @@ s%^\([ ]*#[ ]*endif\)[ ]*[^/* ].*%\1%' \
# #
# Fix 26: Hpux_Cxx_Unready # Fix 24: Hpux_Cxx_Unready
# #
case "$file" in ./sys/mman.h ) case "$file" in ./sys/mman.h )
if ( test -z "`egrep '\"C\"|__BEGIN_DECLS' $file`" if ( test -z "`egrep '\"C\"|__BEGIN_DECLS' $file`"
...@@ -921,7 +877,7 @@ extern "C" {\ ...@@ -921,7 +877,7 @@ extern "C" {\
# #
# Fix 27: Hpux_Maxint # Fix 25: Hpux_Maxint
# #
case "$file" in ./sys/param.h ) case "$file" in ./sys/param.h )
fixlist="${fixlist} fixlist="${fixlist}
...@@ -944,7 +900,7 @@ extern "C" {\ ...@@ -944,7 +900,7 @@ extern "C" {\
# #
# Fix 28: Hpux_Systime # Fix 26: Hpux_Systime
# #
case "$file" in ./sys/time.h ) case "$file" in ./sys/time.h )
if ( test -n "`egrep '^extern struct sigevent;' $file`" if ( test -n "`egrep '^extern struct sigevent;' $file`"
...@@ -965,7 +921,7 @@ extern "C" {\ ...@@ -965,7 +921,7 @@ extern "C" {\
# #
# Fix 29: Interactv_Add1 # Fix 27: Interactv_Add1
# #
case "$file" in ./stdio.h | \ case "$file" in ./stdio.h | \
./math.h | \ ./math.h | \
...@@ -992,7 +948,7 @@ extern "C" {\ ...@@ -992,7 +948,7 @@ extern "C" {\
# #
# Fix 30: Interactv_Add2 # Fix 28: Interactv_Add2
# #
case "$file" in ./math.h ) case "$file" in ./math.h )
if ( test '(' -d /etc/conf/kconfig.d ')' -a \ if ( test '(' -d /etc/conf/kconfig.d ')' -a \
...@@ -1014,7 +970,7 @@ extern "C" {\ ...@@ -1014,7 +970,7 @@ extern "C" {\
# #
# Fix 31: Interactv_Add3 # Fix 29: Interactv_Add3
# #
case "$file" in ./sys/limits.h ) case "$file" in ./sys/limits.h )
if ( test '(' -d /etc/conf/kconfig.d ')' -a \ if ( test '(' -d /etc/conf/kconfig.d ')' -a \
...@@ -1037,7 +993,7 @@ extern "C" {\ ...@@ -1037,7 +993,7 @@ extern "C" {\
# #
# Fix 32: Io_Def_Quotes # Fix 30: Io_Def_Quotes
# #
if ( test -n "`egrep '[ ]_IO[A-Z]*[ ]*\\([A-Za-z]' $file`" if ( test -n "`egrep '[ ]_IO[A-Z]*[ ]*\\([A-Za-z]' $file`"
) > /dev/null 2>&1 ; then ) > /dev/null 2>&1 ; then
...@@ -1057,7 +1013,7 @@ extern "C" {\ ...@@ -1057,7 +1013,7 @@ extern "C" {\
# #
# Fix 33: Ioctl_Fix_Ctrl # Fix 31: Ioctl_Fix_Ctrl
# #
if ( test -n "`egrep 'CTRL[ ]' $file`" if ( test -n "`egrep 'CTRL[ ]' $file`"
) > /dev/null 2>&1 ; then ) > /dev/null 2>&1 ; then
...@@ -1079,7 +1035,7 @@ extern "C" {\ ...@@ -1079,7 +1035,7 @@ extern "C" {\
# #
# Fix 34: Ip_Missing_Semi # Fix 32: Ip_Missing_Semi
# #
case "$file" in ./netinet/ip.h ) case "$file" in ./netinet/ip.h )
fixlist="${fixlist} fixlist="${fixlist}
...@@ -1097,26 +1053,7 @@ extern "C" {\ ...@@ -1097,26 +1053,7 @@ extern "C" {\
# #
# Fix 35: Irix_Bogus_Cxx_Cmnt # Fix 33: Irix_Multiline_Cmnt
#
case "$file" in ./elf_abi.h | \
./elf.h )
fixlist="${fixlist}
irix_bogus_cxx_cmnt"
if [ ! -r ${DESTDIR}/$file ]
then infile=$file
else infile=${DESTDIR}/$file ; fi
sed -e 's@"/\*"\*/@"//"@' \
< $infile > ${DESTDIR}/$file.
mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
;; # case end for file name test
esac
#
# Fix 36: Irix_Multiline_Cmnt
# #
case "$file" in ./sys/types.h ) case "$file" in ./sys/types.h )
fixlist="${fixlist} fixlist="${fixlist}
...@@ -1135,7 +1072,7 @@ extern "C" {\ ...@@ -1135,7 +1072,7 @@ extern "C" {\
# #
# Fix 37: Irix_Sockaddr # Fix 34: Irix_Sockaddr
# #
case "$file" in ./rpc/auth.h ) case "$file" in ./rpc/auth.h )
if ( test -n "`egrep 'authdes_create.*struct sockaddr' $file`" if ( test -n "`egrep 'authdes_create.*struct sockaddr' $file`"
...@@ -1158,7 +1095,7 @@ struct sockaddr; ...@@ -1158,7 +1095,7 @@ struct sockaddr;
# #
# Fix 38: Irix_Struct__File # Fix 35: Irix_Struct__File
# #
case "$file" in ./rpc/xdr.h ) case "$file" in ./rpc/xdr.h )
fixlist="${fixlist} fixlist="${fixlist}
...@@ -1178,7 +1115,7 @@ struct __file_s; ...@@ -1178,7 +1115,7 @@ struct __file_s;
# #
# Fix 39: Isc_Fmod # Fix 36: Isc_Fmod
# #
case "$file" in ./math.h ) case "$file" in ./math.h )
if ( test -n "`egrep 'fmod\\(double\\)' $file`" if ( test -n "`egrep 'fmod\\(double\\)' $file`"
...@@ -1199,7 +1136,7 @@ struct __file_s; ...@@ -1199,7 +1136,7 @@ struct __file_s;
# #
# Fix 40: Motorola_Nested # Fix 37: Motorola_Nested
# #
case "$file" in ./limits.h | \ case "$file" in ./limits.h | \
./sys/limits.h ) ./sys/limits.h )
...@@ -1219,7 +1156,7 @@ struct __file_s; ...@@ -1219,7 +1156,7 @@ struct __file_s;
# #
# Fix 41: Isc_Sys_Limits # Fix 38: Isc_Sys_Limits
# #
case "$file" in ./sys/limits.h ) case "$file" in ./sys/limits.h )
if ( test -n "`egrep 'CHILD_MAX' $file`" if ( test -n "`egrep 'CHILD_MAX' $file`"
...@@ -1241,7 +1178,7 @@ struct __file_s; ...@@ -1241,7 +1178,7 @@ struct __file_s;
# #
# Fix 42: Kandr_Concat # Fix 39: Kandr_Concat
# #
case "$file" in ./sparc/asm_linkage.h | \ case "$file" in ./sparc/asm_linkage.h | \
./sun3/asm_linkage.h | \ ./sun3/asm_linkage.h | \
...@@ -1279,7 +1216,7 @@ struct __file_s; ...@@ -1279,7 +1216,7 @@ struct __file_s;
# #
# Fix 43: Limits_Ifndefs # Fix 40: Limits_Ifndefs
# #
case "$file" in ./limits.h ) case "$file" in ./limits.h )
if ( test -z "`egrep 'ifndef[ ]+FLT_MIN' $file`" if ( test -z "`egrep 'ifndef[ ]+FLT_MIN' $file`"
...@@ -1336,7 +1273,7 @@ struct __file_s; ...@@ -1336,7 +1273,7 @@ struct __file_s;
# #
# Fix 44: Lynx_Void_Int # Fix 41: Lynx_Void_Int
# #
case "$file" in ./curses.h ) case "$file" in ./curses.h )
if ( test -n "`egrep '#[ ]*define[ ]+void[ ]+int' $file`" if ( test -n "`egrep '#[ ]*define[ ]+void[ ]+int' $file`"
...@@ -1357,7 +1294,7 @@ struct __file_s; ...@@ -1357,7 +1294,7 @@ struct __file_s;
# #
# Fix 45: Lynxos_Fcntl_Proto # Fix 42: Lynxos_Fcntl_Proto
# #
case "$file" in ./fcntl.h ) case "$file" in ./fcntl.h )
fixlist="${fixlist} fixlist="${fixlist}
...@@ -1375,7 +1312,7 @@ struct __file_s; ...@@ -1375,7 +1312,7 @@ struct __file_s;
# #
# Fix 46: M88k_Bad_Hypot_Opt # Fix 43: M88k_Bad_Hypot_Opt
# #
case "$file" in ./math.h ) case "$file" in ./math.h )
case "$target_canonical" in m88k-motorola-sysv3* ) case "$target_canonical" in m88k-motorola-sysv3* )
...@@ -1410,7 +1347,7 @@ static __inline__ double fake_hypot (x, y)\ ...@@ -1410,7 +1347,7 @@ static __inline__ double fake_hypot (x, y)\
# #
# Fix 47: M88k_Bad_S_If # Fix 44: M88k_Bad_S_If
# #
case "$file" in ./sys/stat.h ) case "$file" in ./sys/stat.h )
case "$target_canonical" in m88k-*-sysv3* ) case "$target_canonical" in m88k-*-sysv3* )
...@@ -1435,7 +1372,7 @@ static __inline__ double fake_hypot (x, y)\ ...@@ -1435,7 +1372,7 @@ static __inline__ double fake_hypot (x, y)\
# #
# Fix 48: M88k_Multi_Incl # Fix 45: M88k_Multi_Incl
# #
case "$file" in ./time.h ) case "$file" in ./time.h )
case "$target_canonical" in m88k-tektronix-sysv3* ) case "$target_canonical" in m88k-tektronix-sysv3* )
...@@ -1471,7 +1408,7 @@ static __inline__ double fake_hypot (x, y)\ ...@@ -1471,7 +1408,7 @@ static __inline__ double fake_hypot (x, y)\
# #
# Fix 49: Machine_Name # Fix 46: Machine_Name
# #
if ( test -n "`egrep '^#[ ]*(if|elif).*[^a-zA-Z0-9_](_*[MSRrhim]|[Mbimnpstuv])[a-zA-Z0-9_]' $file`" if ( test -n "`egrep '^#[ ]*(if|elif).*[^a-zA-Z0-9_](_*[MSRrhim]|[Mbimnpstuv])[a-zA-Z0-9_]' $file`"
) > /dev/null 2>&1 ; then ) > /dev/null 2>&1 ; then
...@@ -1523,7 +1460,7 @@ s/\\+++fixinc_eol+++/\\/g ...@@ -1523,7 +1460,7 @@ s/\\+++fixinc_eol+++/\\/g
# #
# Fix 50: Math_Exception # Fix 47: Math_Exception
# #
case "$file" in ./math.h ) case "$file" in ./math.h )
if ( test -n "`egrep 'struct exception' $file`" if ( test -n "`egrep 'struct exception' $file`"
...@@ -1563,7 +1500,7 @@ s/\\+++fixinc_eol+++/\\/g ...@@ -1563,7 +1500,7 @@ s/\\+++fixinc_eol+++/\\/g
# #
# Fix 51: Math_Gcc_Ifndefs # Fix 48: Math_Gcc_Ifndefs
# #
case "$file" in ./math.h ) case "$file" in ./math.h )
fixlist="${fixlist} fixlist="${fixlist}
...@@ -1604,7 +1541,7 @@ s/\\+++fixinc_eol+++/\\/g ...@@ -1604,7 +1541,7 @@ s/\\+++fixinc_eol+++/\\/g
# #
# Fix 52: Motorola_Stupid_Opt # Fix 49: Motorola_Stupid_Opt
# #
case "$file" in ./math.h ) case "$file" in ./math.h )
case "$target_canonical" in m88k-motorola-sysv3* ) case "$target_canonical" in m88k-motorola-sysv3* )
...@@ -1641,7 +1578,7 @@ static __inline__ double fake_hypot (x, y)\ ...@@ -1641,7 +1578,7 @@ static __inline__ double fake_hypot (x, y)\
# #
# Fix 53: Nested_Comment # Fix 50: Nested_Comment
# #
case "$file" in ./rpc/rpc.h ) case "$file" in ./rpc/rpc.h )
fixlist="${fixlist} fixlist="${fixlist}
...@@ -1659,7 +1596,7 @@ static __inline__ double fake_hypot (x, y)\ ...@@ -1659,7 +1596,7 @@ static __inline__ double fake_hypot (x, y)\
# #
# Fix 54: News_Os_Recursion # Fix 51: News_Os_Recursion
# #
case "$file" in ./stdlib.h ) case "$file" in ./stdlib.h )
if ( test -n "`egrep '#include <stdlib.h>' $file`" if ( test -n "`egrep '#include <stdlib.h>' $file`"
...@@ -1685,7 +1622,7 @@ static __inline__ double fake_hypot (x, y)\ ...@@ -1685,7 +1622,7 @@ static __inline__ double fake_hypot (x, y)\
# #
# Fix 55: Next_Math_Prefix # Fix 52: Next_Math_Prefix
# #
case "$file" in ./ansi/math.h ) case "$file" in ./ansi/math.h )
if ( test -n "`egrep '^extern.*double.*__const__.*' $file`" if ( test -n "`egrep '^extern.*double.*__const__.*' $file`"
...@@ -1710,7 +1647,7 @@ static __inline__ double fake_hypot (x, y)\ ...@@ -1710,7 +1647,7 @@ static __inline__ double fake_hypot (x, y)\
# #
# Fix 56: Next_Template # Fix 53: Next_Template
# #
case "$file" in ./bsd/libc.h ) case "$file" in ./bsd/libc.h )
if ( test -n "`egrep 'template' $file`" if ( test -n "`egrep 'template' $file`"
...@@ -1732,7 +1669,7 @@ static __inline__ double fake_hypot (x, y)\ ...@@ -1732,7 +1669,7 @@ static __inline__ double fake_hypot (x, y)\
# #
# Fix 57: Next_Volitile # Fix 54: Next_Volitile
# #
case "$file" in ./ansi/stdlib.h ) case "$file" in ./ansi/stdlib.h )
if ( test -n "`egrep 'volatile' $file`" if ( test -n "`egrep 'volatile' $file`"
...@@ -1754,7 +1691,7 @@ static __inline__ double fake_hypot (x, y)\ ...@@ -1754,7 +1691,7 @@ static __inline__ double fake_hypot (x, y)\
# #
# Fix 58: Next_Wait_Union # Fix 55: Next_Wait_Union
# #
case "$file" in ./sys/wait.h ) case "$file" in ./sys/wait.h )
if ( test -n "`egrep 'wait\\(union wait' $file`" if ( test -n "`egrep 'wait\\(union wait' $file`"
...@@ -1775,26 +1712,7 @@ static __inline__ double fake_hypot (x, y)\ ...@@ -1775,26 +1712,7 @@ static __inline__ double fake_hypot (x, y)\
# #
# Fix 59: No_Double_Slash # Fix 56: Nodeent_Syntax
#
if ( test -n "`egrep '//[^*]' $file`" -a \
'(' -z "`echo ${file}|egrep '++|\.hh$|\.H$'`" ')'
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
no_double_slash"
if [ ! -r ${DESTDIR}/$file ]
then infile=$file
else infile=${DESTDIR}/$file ; fi
sed -e '/\/\/[^*]/s|//\(.*\)$|/* \1 */|' \
< $infile > ${DESTDIR}/$file.
mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
fi # end of selection 'if'
#
# Fix 60: Nodeent_Syntax
# #
case "$file" in ./netdnet/dnetdb.h ) case "$file" in ./netdnet/dnetdb.h )
fixlist="${fixlist} fixlist="${fixlist}
...@@ -1812,7 +1730,7 @@ static __inline__ double fake_hypot (x, y)\ ...@@ -1812,7 +1730,7 @@ static __inline__ double fake_hypot (x, y)\
# #
# Fix 61: Osf_Namespace_A # Fix 57: Osf_Namespace_A
# #
case "$file" in ./reg_types.h | \ case "$file" in ./reg_types.h | \
./sys/lc_core.h ) ./sys/lc_core.h )
...@@ -1836,7 +1754,7 @@ static __inline__ double fake_hypot (x, y)\ ...@@ -1836,7 +1754,7 @@ static __inline__ double fake_hypot (x, y)\
# #
# Fix 62: Osf_Namespace_B # Fix 58: Osf_Namespace_B
# #
case "$file" in ./regex.h ) case "$file" in ./regex.h )
if ( test '(' -r reg_types.h-a -r sys/lc_core.h-a -n "`grep '} regex_t;' reg_types.h`"-a -z "`grep __regex_t regex.h`" ')' if ( test '(' -r reg_types.h-a -r sys/lc_core.h-a -n "`grep '} regex_t;' reg_types.h`"-a -z "`grep __regex_t regex.h`" ')'
...@@ -1861,7 +1779,7 @@ typedef __regmatch_t regmatch_t; ...@@ -1861,7 +1779,7 @@ typedef __regmatch_t regmatch_t;
# #
# Fix 63: Pthread_Page_Size # Fix 59: Pthread_Page_Size
# #
case "$file" in ./pthread.h ) case "$file" in ./pthread.h )
if ( test -n "`egrep '^int __page_size' $file`" if ( test -n "`egrep '^int __page_size' $file`"
...@@ -1882,7 +1800,7 @@ typedef __regmatch_t regmatch_t; ...@@ -1882,7 +1800,7 @@ typedef __regmatch_t regmatch_t;
# #
# Fix 64: Rs6000_Double # Fix 60: Rs6000_Double
# #
case "$file" in ./math.h ) case "$file" in ./math.h )
if ( test -n "`egrep '[^a-zA-Z_]class\\(' $file`" if ( test -n "`egrep '[^a-zA-Z_]class\\(' $file`"
...@@ -1908,7 +1826,7 @@ typedef __regmatch_t regmatch_t; ...@@ -1908,7 +1826,7 @@ typedef __regmatch_t regmatch_t;
# #
# Fix 65: Rs6000_Fchmod # Fix 61: Rs6000_Fchmod
# #
case "$file" in ./sys/stat.h ) case "$file" in ./sys/stat.h )
if ( test -n "`egrep 'fchmod\\(char' $file`" if ( test -n "`egrep 'fchmod\\(char' $file`"
...@@ -1929,7 +1847,7 @@ typedef __regmatch_t regmatch_t; ...@@ -1929,7 +1847,7 @@ typedef __regmatch_t regmatch_t;
# #
# Fix 66: Rs6000_Param # Fix 62: Rs6000_Param
# #
case "$file" in ./stdio.h | \ case "$file" in ./stdio.h | \
./unistd.h ) ./unistd.h )
...@@ -1948,7 +1866,7 @@ typedef __regmatch_t regmatch_t; ...@@ -1948,7 +1866,7 @@ typedef __regmatch_t regmatch_t;
# #
# Fix 67: Sony_Include # Fix 63: Sony_Include
# #
case "$file" in ./machine/machparam.h ) case "$file" in ./machine/machparam.h )
if ( test -n "`egrep '\"\\.\\./machine/endian.h\"' $file`" if ( test -n "`egrep '\"\\.\\./machine/endian.h\"' $file`"
...@@ -1969,7 +1887,7 @@ typedef __regmatch_t regmatch_t; ...@@ -1969,7 +1887,7 @@ typedef __regmatch_t regmatch_t;
# #
# Fix 68: Statsswtch # Fix 64: Statsswtch
# #
case "$file" in ./rpcsvc/rstat.h ) case "$file" in ./rpcsvc/rstat.h )
if ( test -n "`egrep 'boottime$' $file`" if ( test -n "`egrep 'boottime$' $file`"
...@@ -1990,7 +1908,7 @@ typedef __regmatch_t regmatch_t; ...@@ -1990,7 +1908,7 @@ typedef __regmatch_t regmatch_t;
# #
# Fix 69: Stdio_Va_List # Fix 65: Stdio_Va_List
# #
case "$file" in ./stdio.h ) case "$file" in ./stdio.h )
fixlist="${fixlist} fixlist="${fixlist}
...@@ -2029,7 +1947,7 @@ typedef __regmatch_t regmatch_t; ...@@ -2029,7 +1947,7 @@ typedef __regmatch_t regmatch_t;
# #
# Fix 70: Sun_Bogus_Ifdef # Fix 66: Sun_Bogus_Ifdef
# #
case "$file" in ./hsfs/hsfs_spec.h | \ case "$file" in ./hsfs/hsfs_spec.h | \
./hsfs/iso_spec.h ) ./hsfs/iso_spec.h )
...@@ -2051,7 +1969,7 @@ typedef __regmatch_t regmatch_t; ...@@ -2051,7 +1969,7 @@ typedef __regmatch_t regmatch_t;
# #
# Fix 71: Sun_Bogus_Ifdef_Sun4c # Fix 67: Sun_Bogus_Ifdef_Sun4c
# #
case "$file" in ./hsfs/hsnode.h ) case "$file" in ./hsfs/hsnode.h )
if ( test -n "`egrep '#ifdef __i386__ || __sun4c__' $file`" if ( test -n "`egrep '#ifdef __i386__ || __sun4c__' $file`"
...@@ -2072,7 +1990,7 @@ typedef __regmatch_t regmatch_t; ...@@ -2072,7 +1990,7 @@ typedef __regmatch_t regmatch_t;
# #
# Fix 72: Sun_Catmacro # Fix 68: Sun_Catmacro
# #
case "$file" in ./pixrect/memvar.h ) case "$file" in ./pixrect/memvar.h )
if ( test -n "`egrep '^#define[ ]+CAT(a,b)' $file`" if ( test -n "`egrep '^#define[ ]+CAT(a,b)' $file`"
...@@ -2100,7 +2018,7 @@ typedef __regmatch_t regmatch_t; ...@@ -2100,7 +2018,7 @@ typedef __regmatch_t regmatch_t;
# #
# Fix 73: Sun_Malloc # Fix 69: Sun_Malloc
# #
case "$file" in ./malloc.h ) case "$file" in ./malloc.h )
fixlist="${fixlist} fixlist="${fixlist}
...@@ -2121,7 +2039,7 @@ typedef __regmatch_t regmatch_t; ...@@ -2121,7 +2039,7 @@ typedef __regmatch_t regmatch_t;
# #
# Fix 74: Sun_Memcpy # Fix 70: Sun_Memcpy
# #
case "$file" in ./memory.h ) 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`" if ( test -n "`egrep '/\\* @\\(#\\)(head/memory.h 50.1 |memory\\.h 1\\.[2-4] 8./../.. SMI; from S5R2 1\\.2 )\\*/' $file`"
...@@ -2163,7 +2081,7 @@ extern int memcmp();\ ...@@ -2163,7 +2081,7 @@ extern int memcmp();\
# #
# Fix 75: Sun_Rusers_Semi # Fix 71: Sun_Rusers_Semi
# #
case "$file" in ./rpcsvc/rusers.h ) case "$file" in ./rpcsvc/rusers.h )
if ( test -n "`egrep '_cnt$' $file`" if ( test -n "`egrep '_cnt$' $file`"
...@@ -2184,7 +2102,7 @@ extern int memcmp();\ ...@@ -2184,7 +2102,7 @@ extern int memcmp();\
# #
# Fix 76: Sun_Signal # Fix 72: Sun_Signal
# #
case "$file" in ./sys/signal.h | \ case "$file" in ./sys/signal.h | \
./signal.h ) ./signal.h )
...@@ -2213,7 +2131,7 @@ void (*signal(...))(...);\ ...@@ -2213,7 +2131,7 @@ void (*signal(...))(...);\
# #
# Fix 77: Sun_Xdr_Proto # Fix 73: Sun_Xdr_Proto
# #
case "$file" in ./rpc/xdr.h ) case "$file" in ./rpc/xdr.h )
fixlist="${fixlist} fixlist="${fixlist}
...@@ -2236,7 +2154,7 @@ void (*signal(...))(...);\ ...@@ -2236,7 +2154,7 @@ void (*signal(...))(...);\
# #
# Fix 78: Sunos_Large_Macro # Fix 74: Sunos_Large_Macro
# #
case "$file" in ./sundev/ipi_error.h ) case "$file" in ./sundev/ipi_error.h )
fixlist="${fixlist} fixlist="${fixlist}
...@@ -2260,7 +2178,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/$file. ...@@ -2260,7 +2178,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/$file.
# #
# Fix 79: Sunos_Matherr_Decl # Fix 75: Sunos_Matherr_Decl
# #
case "$file" in ./math.h ) case "$file" in ./math.h )
if ( test '(' "`fgrep 'struct exception' $file | line`" != 'struct exception {' ')' if ( test '(' "`fgrep 'struct exception' $file | line`" != 'struct exception {' ')'
...@@ -2283,7 +2201,7 @@ struct exception; ...@@ -2283,7 +2201,7 @@ struct exception;
# #
# Fix 80: Sunos_Strlen # Fix 76: Sunos_Strlen
# #
case "$file" in ./strings.h ) case "$file" in ./strings.h )
fixlist="${fixlist} fixlist="${fixlist}
...@@ -2301,7 +2219,7 @@ struct exception; ...@@ -2301,7 +2219,7 @@ struct exception;
# #
# Fix 81: Systypes # Fix 77: Systypes
# #
case "$file" in ./sys/types.h | \ case "$file" in ./sys/types.h | \
./stdlib.h | \ ./stdlib.h | \
...@@ -2317,7 +2235,7 @@ struct exception; ...@@ -2317,7 +2235,7 @@ struct exception;
then infile=$file then infile=$file
else infile=${DESTDIR}/$file ; fi else infile=${DESTDIR}/$file ; fi
sed -e '/^[ ]**[ ]*typedef unsigned int size_t;/N' \ sed -e '/^[ ]*\*[ ]*typedef unsigned int size_t;/N' \
-e 's/^\([ ]*\*[ ]*typedef unsigned int size_t;\n[ ]*\*\/\)/\1\ -e 's/^\([ ]*\*[ ]*typedef unsigned int size_t;\n[ ]*\*\/\)/\1\
#ifndef __SIZE_TYPE__\ #ifndef __SIZE_TYPE__\
#define __SIZE_TYPE__ long unsigned int\ #define __SIZE_TYPE__ long unsigned int\
...@@ -2355,7 +2273,7 @@ typedef __SIZE_TYPE__ size_t;\ ...@@ -2355,7 +2273,7 @@ typedef __SIZE_TYPE__ size_t;\
# #
# Fix 82: Systypes_For_Aix # Fix 78: Systypes_For_Aix
# #
case "$file" in ./sys/types.h ) case "$file" in ./sys/types.h )
if ( test -n "`egrep 'typedef[ ][ ]*[A-Za-z_][ A-Za-z_]*[ ]size_t' $file`" -a \ if ( test -n "`egrep 'typedef[ ][ ]*[A-Za-z_][ A-Za-z_]*[ ]size_t' $file`" -a \
...@@ -2383,7 +2301,7 @@ typedef __SIZE_TYPE__ size_t;\ ...@@ -2383,7 +2301,7 @@ typedef __SIZE_TYPE__ size_t;\
# #
# Fix 83: Sysv68_String # Fix 79: Sysv68_String
# #
case "$file" in ./string.h ) case "$file" in ./string.h )
fixlist="${fixlist} fixlist="${fixlist}
...@@ -2411,7 +2329,7 @@ extern unsigned int\ ...@@ -2411,7 +2329,7 @@ extern unsigned int\
# #
# Fix 84: Sysz_Stdlib_For_Sun # Fix 80: Sysz_Stdlib_For_Sun
# #
case "$file" in ./stdlib.h ) case "$file" in ./stdlib.h )
case "$target_canonical" in *-sun-* | \ case "$target_canonical" in *-sun-* | \
...@@ -2445,7 +2363,7 @@ extern unsigned int\ ...@@ -2445,7 +2363,7 @@ extern unsigned int\
# #
# Fix 85: Sysz_Stdtypes_For_Sun # Fix 81: Sysz_Stdtypes_For_Sun
# #
case "$file" in ./sys/stdtypes.h ) case "$file" in ./sys/stdtypes.h )
fixlist="${fixlist} fixlist="${fixlist}
...@@ -2483,7 +2401,7 @@ extern unsigned int\ ...@@ -2483,7 +2401,7 @@ extern unsigned int\
# #
# Fix 86: Tinfo_Cplusplus # Fix 82: Tinfo_Cplusplus
# #
case "$file" in ./tinfo.h ) case "$file" in ./tinfo.h )
fixlist="${fixlist} fixlist="${fixlist}
...@@ -2501,7 +2419,7 @@ extern unsigned int\ ...@@ -2501,7 +2419,7 @@ extern unsigned int\
# #
# Fix 87: Ultrix_Ansi_Compat # Fix 83: Ultrix_Ansi_Compat
# #
case "$file" in ./ansi_compat.h ) case "$file" in ./ansi_compat.h )
if ( test -n "`egrep 'ULTRIX' $file`" if ( test -n "`egrep 'ULTRIX' $file`"
...@@ -2525,7 +2443,7 @@ extern unsigned int\ ...@@ -2525,7 +2443,7 @@ extern unsigned int\
# #
# Fix 88: Ultrix_Atof_Param # Fix 84: Ultrix_Atof_Param
# #
case "$file" in ./math.h ) case "$file" in ./math.h )
fixlist="${fixlist} fixlist="${fixlist}
...@@ -2547,7 +2465,7 @@ extern unsigned int\ ...@@ -2547,7 +2465,7 @@ extern unsigned int\
# #
# Fix 89: Ultrix_Const # Fix 85: Ultrix_Const
# #
case "$file" in ./stdio.h ) case "$file" in ./stdio.h )
fixlist="${fixlist} fixlist="${fixlist}
...@@ -2573,7 +2491,7 @@ extern unsigned int\ ...@@ -2573,7 +2491,7 @@ extern unsigned int\
# #
# Fix 90: Ultrix_Ifdef # Fix 86: Ultrix_Ifdef
# #
case "$file" in ./sys/file.h ) case "$file" in ./sys/file.h )
if ( test -n "`egrep '#ifdef KERNEL' $file`" if ( test -n "`egrep '#ifdef KERNEL' $file`"
...@@ -2594,7 +2512,7 @@ extern unsigned int\ ...@@ -2594,7 +2512,7 @@ extern unsigned int\
# #
# Fix 91: Ultrix_Nested_Cmnt # Fix 87: Ultrix_Nested_Cmnt
# #
case "$file" in ./rpc/svc.h ) case "$file" in ./rpc/svc.h )
fixlist="${fixlist} fixlist="${fixlist}
...@@ -2612,7 +2530,7 @@ extern unsigned int\ ...@@ -2612,7 +2530,7 @@ extern unsigned int\
# #
# Fix 92: Ultrix_Static # Fix 88: Ultrix_Static
# #
case "$file" in ./machine/cpu.h ) case "$file" in ./machine/cpu.h )
if ( test -n "`egrep '#include \"r[34]_cpu' $file`" if ( test -n "`egrep '#include \"r[34]_cpu' $file`"
...@@ -2635,7 +2553,7 @@ extern unsigned int\ ...@@ -2635,7 +2553,7 @@ extern unsigned int\
# #
# Fix 93: Undefine_Null # Fix 89: Undefine_Null
# #
if ( test -n "`egrep '^#[ ]*define[ ]*[ ]NULL[ ]' $file`" -a \ if ( test -n "`egrep '^#[ ]*define[ ]*[ ]NULL[ ]' $file`" -a \
-z "`egrep '#[ ]*(ifn|un)def[ ]*[ ]NULL($|[ ])' $file`" -z "`egrep '#[ ]*(ifn|un)def[ ]*[ ]NULL($|[ ])' $file`"
...@@ -2656,7 +2574,7 @@ extern unsigned int\ ...@@ -2656,7 +2574,7 @@ extern unsigned int\
# #
# Fix 94: Va_I960_Macro # Fix 90: Va_I960_Macro
# #
case "$file" in ./arch/i960/archI960.h ) case "$file" in ./arch/i960/archI960.h )
if ( test -n "`egrep '__(vsiz|vali|vpad|alignof__)' $file`" if ( test -n "`egrep '__(vsiz|vali|vpad|alignof__)' $file`"
...@@ -2680,7 +2598,7 @@ extern unsigned int\ ...@@ -2680,7 +2598,7 @@ extern unsigned int\
# #
# Fix 95: Void_Null # Fix 91: Void_Null
# #
case "$file" in ./curses.h | \ case "$file" in ./curses.h | \
./dbm.h | \ ./dbm.h | \
...@@ -2711,7 +2629,7 @@ extern unsigned int\ ...@@ -2711,7 +2629,7 @@ extern unsigned int\
# #
# Fix 96: Vxworks_Gcc_Problem # Fix 92: Vxworks_Gcc_Problem
# #
case "$file" in ./types/vxTypesBase.h ) case "$file" in ./types/vxTypesBase.h )
if ( test -n "`egrep '__GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__' $file`" if ( test -n "`egrep '__GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__' $file`"
...@@ -2753,7 +2671,7 @@ extern unsigned int\ ...@@ -2753,7 +2671,7 @@ extern unsigned int\
# #
# Fix 97: Vxworks_Needs_Vxtypes # Fix 93: Vxworks_Needs_Vxtypes
# #
case "$file" in ./time.h ) case "$file" in ./time.h )
if ( test -n "`egrep 'uint_t[ ][ ]*_clocks_per_sec' $file`" if ( test -n "`egrep 'uint_t[ ][ ]*_clocks_per_sec' $file`"
...@@ -2774,7 +2692,7 @@ extern unsigned int\ ...@@ -2774,7 +2692,7 @@ extern unsigned int\
# #
# Fix 98: Vxworks_Needs_Vxworks # Fix 94: Vxworks_Needs_Vxworks
# #
case "$file" in ./sys/stat.h ) case "$file" in ./sys/stat.h )
if ( test -n "`egrep '#[ ]define[ ][ ]*__INCstath' $file`" -a \ if ( test -n "`egrep '#[ ]define[ ][ ]*__INCstath' $file`" -a \
...@@ -2800,7 +2718,7 @@ extern unsigned int\ ...@@ -2800,7 +2718,7 @@ extern unsigned int\
# #
# Fix 99: Vxworks_Time # Fix 95: Vxworks_Time
# #
case "$file" in ./time.h ) case "$file" in ./time.h )
if ( test -n "`egrep 'VOIDFUNCPTR' $file`" -a \ if ( test -n "`egrep 'VOIDFUNCPTR' $file`" -a \
...@@ -2832,7 +2750,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\ ...@@ -2832,7 +2750,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\
# #
# Fix 100: X11_Class # Fix 96: X11_Class
# #
case "$file" in ./X11/ShellP.h ) case "$file" in ./X11/ShellP.h )
if ( test -z "`egrep '__cplusplus' $file`" if ( test -z "`egrep '__cplusplus' $file`"
...@@ -2860,7 +2778,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\ ...@@ -2860,7 +2778,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\
# #
# Fix 101: X11_Class_Usage # Fix 97: X11_Class_Usage
# #
case "$file" in ./Xm/BaseClassI.h ) case "$file" in ./Xm/BaseClassI.h )
if ( test -z "`egrep '__cplusplus' $file`" if ( test -z "`egrep '__cplusplus' $file`"
...@@ -2881,7 +2799,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\ ...@@ -2881,7 +2799,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\
# #
# Fix 102: X11_New # Fix 98: X11_New
# #
case "$file" in ./Xm/Traversal.h ) case "$file" in ./Xm/Traversal.h )
if ( test -z "`egrep '__cplusplus' $file`" if ( test -z "`egrep '__cplusplus' $file`"
...@@ -2910,7 +2828,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\ ...@@ -2910,7 +2828,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\
# #
# Fix 103: X11_Sprintf # Fix 99: X11_Sprintf
# #
case "$file" in ./X11*/Xmu.h ) case "$file" in ./X11*/Xmu.h )
fixlist="${fixlist} fixlist="${fixlist}
...@@ -2930,7 +2848,7 @@ extern char * sprintf();\ ...@@ -2930,7 +2848,7 @@ extern char * sprintf();\
# #
# Fix 104: Zzz_Ki_Iface # Fix 100: Zzz_Ki_Iface
# #
case "$file" in ./sys/ki_iface.h ) case "$file" in ./sys/ki_iface.h )
if ( test -n "`egrep 'These definitions are for HP Internal developers' $file`" if ( test -n "`egrep 'These definitions are for HP Internal developers' $file`"
...@@ -2957,7 +2875,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/$file. ...@@ -2957,7 +2875,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/$file.
# #
# Fix 105: Zzz_Ki # Fix 101: Zzz_Ki
# #
case "$file" in ./sys/ki.h ) case "$file" in ./sys/ki.h )
if ( test -n "`egrep '11.00 HP-UX LP64' $file`" if ( test -n "`egrep '11.00 HP-UX LP64' $file`"
...@@ -2984,7 +2902,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/$file. ...@@ -2984,7 +2902,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/$file.
# #
# Fix 106: Zzz_Ki_Calls # Fix 102: Zzz_Ki_Calls
# #
case "$file" in ./sys/ki_calls.h ) case "$file" in ./sys/ki_calls.h )
if ( test -n "`egrep 'KI_MAX_PROCS is an arbitrary number' $file`" if ( test -n "`egrep 'KI_MAX_PROCS is an arbitrary number' $file`"
...@@ -3011,7 +2929,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/$file. ...@@ -3011,7 +2929,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/$file.
# #
# Fix 107: Zzz_Ki_Defs # Fix 103: Zzz_Ki_Defs
# #
case "$file" in ./sys/ki_defs.h ) case "$file" in ./sys/ki_defs.h )
if ( test -n "`egrep 'Kernel Instrumentation Definitions' $file`" if ( test -n "`egrep 'Kernel Instrumentation Definitions' $file`"
...@@ -3038,7 +2956,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/$file. ...@@ -3038,7 +2956,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/$file.
# #
# Fix 108: Zzz_Time # Fix 104: Zzz_Time
# #
case "$file" in ./sys/time.h ) case "$file" in ./sys/time.h )
if ( test -n "`egrep 'For CASPEC, look in' $file`" if ( test -n "`egrep 'For CASPEC, look in' $file`"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment