code cleanups

From-SVN: r36359

gcc/ChangeLog

+2000-09-12  Bruce Korb  <bkorb@gnu.org>
+
+	* fixinc/fixfixes.c: make a type for the fix procedure & use it,
+	remove obsolete code
+	* fixinc/fixincl.c: Use PARAMS, not _P_.  Add no-op default to switch.
+	* fixinc/fixincl.tpl: make non-exported arrays static scope
+	* fixinc/fixincl.x: regenerate
+	* fixinc/fixlib.h: Use PARAMS, not _P_
+	* fixinc/fixtests.c: make a type for the test proc & use it
+	* fixinc/server.h: Use PARAMS, not _P_
+
 2000-09-12  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* c-typeck.c (process_init_element): Avoid union init warnings on

gcc/fixinc/fixfixes.c

@@ -66,9 +66,10 @@ Boston, MA 02111-1307, USA.  */
 
 tSCC zNeedsArg[] = "fixincl error:  `%s' needs %s argument (c_fix_arg[%d])\n";
 
+typedef void t_fix_proc PARAMS ((const char *, const char *, tFixDesc *));
 typedef struct {
     const char*  fix_name;
-    void (*fix_proc)();
+    t_fix_proc*  fix_proc;
 } fix_entry_t;
 
 #define FIXUP_TABLE \
@@ -80,13 +81,14 @@ typedef struct {
   _FT_( "gnu_type",         gnu_type_fix )
 
 
-#define FIX_PROC_HEAD( fix ) \
-static void fix ( filname, text, p_fixd ) \
-    const char* filname; \
-    const char* text; \
+#define FIX_PROC_HEAD( fix )                    \
+static t_fix_proc fix; /* avoid warning */      \
+static void fix ( filname, text, p_fixd )       \
+    const char* filname;                        \
+    const char* text;                           \
     tFixDesc* p_fixd;
 
-
+#ifdef NEED_PRINT_QUOTE
 /*
  *  Skip over a quoted string.  Single quote strings may
  *  contain multiple characters if the first character is
@@ -128,6 +130,7 @@ print_quote( q, text )
 
   return text;
 }
+#endif /* NEED_PRINT_QUOTE */
 
 
 /*
@@ -250,7 +253,6 @@ FIX_PROC_HEAD( format_fix )
 {
   tCC*  pz_pat = p_fixd->patch_args[2];
   tCC*  pz_fmt = p_fixd->patch_args[1];
-  const char *p;
   regex_t re;
   regmatch_t rm[10];
 
@@ -295,9 +297,6 @@ FIX_PROC_HEAD( format_fix )
   compile_re (pz_pat, &re, 1, "format search-text", "format_fix" );
   while (regexec (&re, text, 10, rm, 0) == 0)
     {
-      char* apz[10];
-      int   i;
-
       fwrite( text, rm[0].rm_so, 1, stdout );
       format_write( pz_fmt, text, rm );
       text += rm[0].rm_eo;

gcc/fixinc/fixincl.c

@@ -93,12 +93,11 @@ const char incl_quote_pat[] = "^[ \t]*#[ \t]*include[ \t]*\"[^/]";
 tSCC z_fork_err[] = "Error %d (%s) starting filter process for %s\n";
 regex_t incl_quote_re;
 
-void do_version ();
-char *load_file  _P_((const char *));
-void process  _P_((char *, const char *));
-void run_compiles ();
-void initialize _P_((int argc,char** argv));
-void process ();
+void do_version   PARAMS((void));
+char *load_file   PARAMS((const char *));
+void run_compiles PARAMS((void));
+void initialize   PARAMS((int argc,char** argv));
+void process      PARAMS((void));
 
 /*  External Source Code */
 
@@ -523,6 +522,7 @@ run_compiles ()
               p_test->p_test_regex = p_re++;
               compile_re (p_test->pz_test_text, p_test->p_test_regex, 0,
                           "select test", p_fixd->fix_name);
+            default: break;
             }
           p_test++;
         }

gcc/fixinc/fixincl.tpl

@@ -124,7 +124,7 @@ _SETENV re_ct
 	re_ct _env _val
 	select _count +
 	bypass _count + =]
-tTestDesc a[=hackname _cap=]Tests[] = {[=
+static tTestDesc a[=hackname _cap=]Tests[] = {[=
 
     _FOR test =]
   { TT_TEST,     z[=hackname _cap=]Test[=_eval _index=],   0 /* unused */ },[=
@@ -149,7 +149,7 @@ tTestDesc a[=hackname _cap=]Tests[] = {[=
 /*
  *  Fix Command Arguments for [=hackname _cap=]
  */
-const char* apz[=hackname _cap=]Patch[] = {[=
+static const char* apz[=hackname _cap=]Patch[] = {[=
     _IF   sed         _exist =] "sed"[=
       _FOR sed=],
     "-e", [=sed _krstr=][=

gcc/fixinc/fixincl.x

@@ -55,13 +55,13 @@ tSCC zAaa_Ki_IfaceSelect0[] =
        "These definitions are for HP Internal developers";
 
 #define    AAA_KI_IFACE_TEST_CT  1
-tTestDesc aAaa_Ki_IfaceTests[] = {
+static tTestDesc aAaa_Ki_IfaceTests[] = {
   { TT_EGREP,    zAaa_Ki_IfaceSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Aaa_Ki_Iface
  */
-const char* apzAaa_Ki_IfacePatch[] = {
+static const char* apzAaa_Ki_IfacePatch[] = {
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -89,13 +89,13 @@ tSCC zAaa_KiSelect0[] =
        "11.00 HP-UX LP64";
 
 #define    AAA_KI_TEST_CT  1
-tTestDesc aAaa_KiTests[] = {
+static tTestDesc aAaa_KiTests[] = {
   { TT_EGREP,    zAaa_KiSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Aaa_Ki
  */
-const char* apzAaa_KiPatch[] = {
+static const char* apzAaa_KiPatch[] = {
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -123,13 +123,13 @@ tSCC zAaa_Ki_CallsSelect0[] =
        "kthread_create_caller_t";
 
 #define    AAA_KI_CALLS_TEST_CT  1
-tTestDesc aAaa_Ki_CallsTests[] = {
+static tTestDesc aAaa_Ki_CallsTests[] = {
   { TT_EGREP,    zAaa_Ki_CallsSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Aaa_Ki_Calls
  */
-const char* apzAaa_Ki_CallsPatch[] = {
+static const char* apzAaa_Ki_CallsPatch[] = {
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -157,13 +157,13 @@ tSCC zAaa_Ki_DefsSelect0[] =
        "Kernel Instrumentation Definitions";
 
 #define    AAA_KI_DEFS_TEST_CT  1
-tTestDesc aAaa_Ki_DefsTests[] = {
+static tTestDesc aAaa_Ki_DefsTests[] = {
   { TT_EGREP,    zAaa_Ki_DefsSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Aaa_Ki_Defs
  */
-const char* apzAaa_Ki_DefsPatch[] = {
+static const char* apzAaa_Ki_DefsPatch[] = {
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -189,7 +189,7 @@ tSCC zAaa_Bad_FixesList[] =
 /*
  *  Fix Command Arguments for Aaa_Bad_Fixes
  */
-const char* apzAaa_Bad_FixesPatch[] = {
+static const char* apzAaa_Bad_FixesPatch[] = {
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -217,13 +217,13 @@ tSCC zAaa_TimeSelect0[] =
        "11.0 and later representation of ki time";
 
 #define    AAA_TIME_TEST_CT  1
-tTestDesc aAaa_TimeTests[] = {
+static tTestDesc aAaa_TimeTests[] = {
   { TT_EGREP,    zAaa_TimeSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Aaa_Time
  */
-const char* apzAaa_TimePatch[] = {
+static const char* apzAaa_TimePatch[] = {
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -249,7 +249,7 @@ tSCC zAab_Dgux_Int_VarargsList[] =
 /*
  *  Fix Command Arguments for Aab_Dgux_Int_Varargs
  */
-const char* apzAab_Dgux_Int_VarargsPatch[] = {
+static const char* apzAab_Dgux_Int_VarargsPatch[] = {
 "#ifndef __INT_VARARGS_H\n\
 #define __INT_VARARGS_H\n\
 \n\
@@ -341,13 +341,13 @@ tSCC zAab_Fd_Zero_Asm_Posix_Types_HBypass0[] =
        "} while";
 
 #define    AAB_FD_ZERO_ASM_POSIX_TYPES_H_TEST_CT  1
-tTestDesc aAab_Fd_Zero_Asm_Posix_Types_HTests[] = {
+static tTestDesc aAab_Fd_Zero_Asm_Posix_Types_HTests[] = {
   { TT_NEGREP,   zAab_Fd_Zero_Asm_Posix_Types_HBypass0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Aab_Fd_Zero_Asm_Posix_Types_H
  */
-const char* apzAab_Fd_Zero_Asm_Posix_Types_HPatch[] = {
+static const char* apzAab_Fd_Zero_Asm_Posix_Types_HPatch[] = {
 "/* This file fixes a bug in the __FD_ZERO macro\n\
    for older versions of the Linux kernel. */\n\
 #ifndef _POSIX_TYPES_H_WRAPPER\n\
@@ -395,7 +395,7 @@ tSCC* apzAab_Fd_Zero_Gnu_Types_HMachs[] = {
 /*
  *  Fix Command Arguments for Aab_Fd_Zero_Gnu_Types_H
  */
-const char* apzAab_Fd_Zero_Gnu_Types_HPatch[] = {
+static const char* apzAab_Fd_Zero_Gnu_Types_HPatch[] = {
 "/* This file fixes a bug in the __FD_ZERO macro present in glibc 1.x. */\n\
 #ifndef _TYPES_H_WRAPPER\n\
 #include <features.h>\n\
@@ -442,7 +442,7 @@ tSCC* apzAab_Fd_Zero_Selectbits_HMachs[] = {
 /*
  *  Fix Command Arguments for Aab_Fd_Zero_Selectbits_H
  */
-const char* apzAab_Fd_Zero_Selectbits_HPatch[] = {
+static const char* apzAab_Fd_Zero_Selectbits_HPatch[] = {
 "/* This file fixes a bug in the __FD_ZERO macro present in glibc 2.0.x. */\n\
 #ifndef _SELECTBITS_H_WRAPPER\n\
 #include <features.h>\n\
@@ -493,13 +493,13 @@ tSCC zAab_Sun_MemcpySelect0[] =
        "/\\*\t@\\(#\\)(head/memory.h\t50.1\t |memory\\.h 1\\.[2-4] 8./../.. SMI; from S5R2 1\\.2\t)\\*/";
 
 #define    AAB_SUN_MEMCPY_TEST_CT  1
-tTestDesc aAab_Sun_MemcpyTests[] = {
+static tTestDesc aAab_Sun_MemcpyTests[] = {
   { TT_EGREP,    zAab_Sun_MemcpySelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Aab_Sun_Memcpy
  */
-const char* apzAab_Sun_MemcpyPatch[] = {
+static const char* apzAab_Sun_MemcpyPatch[] = {
 "/* This file was generated by fixincludes */\n\
 #ifndef __memory_h__\n\
 #define __memory_h__\n\
@@ -551,7 +551,7 @@ tSCC* apzAab_Svr4_Replace_ByteorderMachs[] = {
 /*
  *  Fix Command Arguments for Aab_Svr4_Replace_Byteorder
  */
-const char* apzAab_Svr4_Replace_ByteorderPatch[] = {
+static const char* apzAab_Svr4_Replace_ByteorderPatch[] = {
 "#ifndef _SYS_BYTEORDER_H\n\
 #define _SYS_BYTEORDER_H\n\
 \n\
@@ -722,13 +722,13 @@ tSCC zAab_Ultrix_Ansi_CompatSelect0[] =
        "ULTRIX";
 
 #define    AAB_ULTRIX_ANSI_COMPAT_TEST_CT  1
-tTestDesc aAab_Ultrix_Ansi_CompatTests[] = {
+static tTestDesc aAab_Ultrix_Ansi_CompatTests[] = {
   { TT_EGREP,    zAab_Ultrix_Ansi_CompatSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Aab_Ultrix_Ansi_Compat
  */
-const char* apzAab_Ultrix_Ansi_CompatPatch[] = {
+static const char* apzAab_Ultrix_Ansi_CompatPatch[] = {
 "/* This file intentionally left blank.  */\n",
     (char*)NULL };
 
@@ -757,7 +757,7 @@ tSCC* apzAab_Ultrix_LimitsMachs[] = {
 /*
  *  Fix Command Arguments for Aab_Ultrix_Limits
  */
-const char* apzAab_Ultrix_LimitsPatch[] = {
+static const char* apzAab_Ultrix_LimitsPatch[] = {
 "/*\t@(#)limits.h\t\t\t\t*/\n\
 /* This file was generated by fixincludes\t*/\n\
 #ifndef _LIMITS_INCLUDED\n\
@@ -791,7 +791,7 @@ tSCC* apzAab_Ultrix_MemoryMachs[] = {
 /*
  *  Fix Command Arguments for Aab_Ultrix_Memory
  */
-const char* apzAab_Ultrix_MemoryPatch[] = {
+static const char* apzAab_Ultrix_MemoryPatch[] = {
 "/*\t@(#)memory.h\t\t\t\t*/\n\
 /* This file was generated by fixincludes\t*/\n\
 #ifndef _MEMORY_INCLUDED\n\
@@ -825,7 +825,7 @@ tSCC* apzAab_Ultrix_StringMachs[] = {
 /*
  *  Fix Command Arguments for Aab_Ultrix_String
  */
-const char* apzAab_Ultrix_StringPatch[] = {
+static const char* apzAab_Ultrix_StringPatch[] = {
 "/*\t@(#)string.h\t\t\t\t*/\n\
 /* This file was generated by fixincludes\t*/\n\
 #ifndef _STRING_INCLUDED\n\
@@ -861,13 +861,13 @@ tSCC zAix_PthreadSelect0[] =
 (])";
 
 #define    AIX_PTHREAD_TEST_CT  1
-tTestDesc aAix_PthreadTests[] = {
+static tTestDesc aAix_PthreadTests[] = {
   { TT_EGREP,    zAix_PthreadSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Aix_Pthread
  */
-const char* apzAix_PthreadPatch[] = {
+static const char* apzAix_PthreadPatch[] = {
     "format",
     "%1 %2",
     (char*)NULL };
@@ -897,13 +897,13 @@ tSCC zAix_SysmachineSelect0[] =
        "\\\\ +\n";
 
 #define    AIX_SYSMACHINE_TEST_CT  1
-tTestDesc aAix_SysmachineTests[] = {
+static tTestDesc aAix_SysmachineTests[] = {
   { TT_EGREP,    zAix_SysmachineSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Aix_Sysmachine
  */
-const char* apzAix_SysmachinePatch[] = {
+static const char* apzAix_SysmachinePatch[] = {
     "format",
     "\\\n",
     (char*)NULL };
@@ -935,14 +935,14 @@ tSCC zAix_SyswaitSelect1[] =
        "bos325,";
 
 #define    AIX_SYSWAIT_TEST_CT  2
-tTestDesc aAix_SyswaitTests[] = {
+static tTestDesc aAix_SyswaitTests[] = {
   { TT_EGREP,    zAix_SyswaitSelect0, (regex_t*)NULL },
   { TT_EGREP,    zAix_SyswaitSelect1, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Aix_Syswait
  */
-const char* apzAix_SyswaitPatch[] = {
+static const char* apzAix_SyswaitPatch[] = {
     "format",
     "struct rusage;\n\
 %0",
@@ -973,13 +973,13 @@ tSCC zAix_VolatileSelect0[] =
        "typedef volatile int sig_atomic_t";
 
 #define    AIX_VOLATILE_TEST_CT  1
-tTestDesc aAix_VolatileTests[] = {
+static tTestDesc aAix_VolatileTests[] = {
   { TT_EGREP,    zAix_VolatileSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Aix_Volatile
  */
-const char* apzAix_VolatilePatch[] = {
+static const char* apzAix_VolatilePatch[] = {
     "format",
     "typedef int sig_atomic_t",
     (char*)NULL };
@@ -1009,13 +1009,13 @@ tSCC zAlpha_GetoptSelect0[] =
        "getopt\\(int, char \\*\\[\\], *char \\*\\)";
 
 #define    ALPHA_GETOPT_TEST_CT  1
-tTestDesc aAlpha_GetoptTests[] = {
+static tTestDesc aAlpha_GetoptTests[] = {
   { TT_EGREP,    zAlpha_GetoptSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Alpha_Getopt
  */
-const char* apzAlpha_GetoptPatch[] = {
+static const char* apzAlpha_GetoptPatch[] = {
     "format",
     "getopt(int, char *const[], const char *)",
     (char*)NULL };
@@ -1045,13 +1045,13 @@ tSCC zAlpha_ParensSelect0[] =
        "#ifndef\\(__mips64\\)";
 
 #define    ALPHA_PARENS_TEST_CT  1
-tTestDesc aAlpha_ParensTests[] = {
+static tTestDesc aAlpha_ParensTests[] = {
   { TT_EGREP,    zAlpha_ParensSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Alpha_Parens
  */
-const char* apzAlpha_ParensPatch[] = {
+static const char* apzAlpha_ParensPatch[] = {
     "format",
     "#ifndef __mips64",
     (char*)NULL };
@@ -1081,13 +1081,13 @@ tSCC zAlpha_SbrkSelect0[] =
        "char[ \t]*\\*[\t ]*sbrk[ \t]*\\(";
 
 #define    ALPHA_SBRK_TEST_CT  1
-tTestDesc aAlpha_SbrkTests[] = {
+static tTestDesc aAlpha_SbrkTests[] = {
   { TT_EGREP,    zAlpha_SbrkSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Alpha_Sbrk
  */
-const char* apzAlpha_SbrkPatch[] = {
+static const char* apzAlpha_SbrkPatch[] = {
     "format",
     "void *sbrk(",
     (char*)NULL };
@@ -1117,13 +1117,13 @@ tSCC zArm_Norcroft_HintSelect0[] =
        "___type p_type";
 
 #define    ARM_NORCROFT_HINT_TEST_CT  1
-tTestDesc aArm_Norcroft_HintTests[] = {
+static tTestDesc aArm_Norcroft_HintTests[] = {
   { TT_EGREP,    zArm_Norcroft_HintSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Arm_Norcroft_Hint
  */
-const char* apzArm_Norcroft_HintPatch[] = {
+static const char* apzArm_Norcroft_HintPatch[] = {
     "format",
     "p_type",
     (char*)NULL };
@@ -1153,13 +1153,13 @@ tSCC zArm_WcharSelect0[] =
        "#[ \t]*define[ \t]*__wchar_t";
 
 #define    ARM_WCHAR_TEST_CT  1
-tTestDesc aArm_WcharTests[] = {
+static tTestDesc aArm_WcharTests[] = {
   { TT_EGREP,    zArm_WcharSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Arm_Wchar
  */
-const char* apzArm_WcharPatch[] = {
+static const char* apzArm_WcharPatch[] = {
     "format",
     "%1_GCC_WCHAR_T",
     "(#[ \t]*(ifndef|define)[ \t]+)__wchar_t",
@@ -1190,13 +1190,13 @@ tSCC zAux_AsmSelect0[] =
        "#ifndef NOINLINE";
 
 #define    AUX_ASM_TEST_CT  1
-tTestDesc aAux_AsmTests[] = {
+static tTestDesc aAux_AsmTests[] = {
   { TT_EGREP,    zAux_AsmSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Aux_Asm
  */
-const char* apzAux_AsmPatch[] = {
+static const char* apzAux_AsmPatch[] = {
     "format",
     "#if !defined(NOINLINE) && !defined(__GNUC__)",
     (char*)NULL };
@@ -1232,14 +1232,14 @@ tSCC zAvoid_Bool_DefineBypass0[] =
        "we must use the C\\+\\+ compiler's type";
 
 #define    AVOID_BOOL_DEFINE_TEST_CT  2
-tTestDesc aAvoid_Bool_DefineTests[] = {
+static tTestDesc aAvoid_Bool_DefineTests[] = {
   { TT_NEGREP,   zAvoid_Bool_DefineBypass0, (regex_t*)NULL },
   { TT_EGREP,    zAvoid_Bool_DefineSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Avoid_Bool_Define
  */
-const char* apzAvoid_Bool_DefinePatch[] = {
+static const char* apzAvoid_Bool_DefinePatch[] = {
     "format",
     "#ifndef __cplusplus\n\
 %0\n\
@@ -1278,14 +1278,14 @@ tSCC zAvoid_Bool_TypeBypass0[] =
        "we must use the C\\+\\+ compiler's type";
 
 #define    AVOID_BOOL_TYPE_TEST_CT  2
-tTestDesc aAvoid_Bool_TypeTests[] = {
+static tTestDesc aAvoid_Bool_TypeTests[] = {
   { TT_NEGREP,   zAvoid_Bool_TypeBypass0, (regex_t*)NULL },
   { TT_EGREP,    zAvoid_Bool_TypeSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Avoid_Bool_Type
  */
-const char* apzAvoid_Bool_TypePatch[] = {
+static const char* apzAvoid_Bool_TypePatch[] = {
     "format",
     "#ifndef __cplusplus\n\
 %0\n\
@@ -1318,13 +1318,13 @@ tSCC zBad_LvalSelect0[] =
        "^[ \t]*#[ \t]*pragma[ \t]+extern_prefix";
 
 #define    BAD_LVAL_TEST_CT  1
-tTestDesc aBad_LvalTests[] = {
+static tTestDesc aBad_LvalTests[] = {
   { TT_EGREP,    zBad_LvalSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Bad_Lval
  */
-const char* apzBad_LvalPatch[] = { "sed",
+static const char* apzBad_LvalPatch[] = { "sed",
     "-e", "s/^[ \t]*#[ \t]*define[ \t][ \t]*\\([^(]*\\)\\(([^)]*)\\)[ \t]*\\(_.*\\)\\1\\2[ \t]*$/#define \\1 \\3\\1/",
     (char*)NULL };
 
@@ -1353,13 +1353,13 @@ tSCC zBad_Struct_TermSelect0[] =
        "^[ \t]*typedef[ \t]+struct[ \t]+term[ \t]*;";
 
 #define    BAD_STRUCT_TERM_TEST_CT  1
-tTestDesc aBad_Struct_TermTests[] = {
+static tTestDesc aBad_Struct_TermTests[] = {
   { TT_EGREP,    zBad_Struct_TermSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Bad_Struct_Term
  */
-const char* apzBad_Struct_TermPatch[] = {
+static const char* apzBad_Struct_TermPatch[] = {
     "format",
     "struct term;",
     (char*)NULL };
@@ -1389,13 +1389,13 @@ tSCC zBadquoteSelect0[] =
        "doesn't";
 
 #define    BADQUOTE_TEST_CT  1
-tTestDesc aBadquoteTests[] = {
+static tTestDesc aBadquoteTests[] = {
   { TT_EGREP,    zBadquoteSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Badquote
  */
-const char* apzBadquotePatch[] = {
+static const char* apzBadquotePatch[] = {
     "format",
     "does not",
     (char*)NULL };
@@ -1431,14 +1431,14 @@ tSCC zBroken_Assert_StdioBypass0[] =
        "include.*stdio\\.h";
 
 #define    BROKEN_ASSERT_STDIO_TEST_CT  2
-tTestDesc aBroken_Assert_StdioTests[] = {
+static tTestDesc aBroken_Assert_StdioTests[] = {
   { TT_NEGREP,   zBroken_Assert_StdioBypass0, (regex_t*)NULL },
   { TT_EGREP,    zBroken_Assert_StdioSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Broken_Assert_Stdio
  */
-const char* apzBroken_Assert_StdioPatch[] = {
+static const char* apzBroken_Assert_StdioPatch[] = {
     "wrap",
     "#include <stdio.h>\n",
     (char*)NULL };
@@ -1474,14 +1474,14 @@ tSCC zBroken_Assert_StdlibBypass0[] =
        "include.*stdlib\\.h";
 
 #define    BROKEN_ASSERT_STDLIB_TEST_CT  2
-tTestDesc aBroken_Assert_StdlibTests[] = {
+static tTestDesc aBroken_Assert_StdlibTests[] = {
   { TT_NEGREP,   zBroken_Assert_StdlibBypass0, (regex_t*)NULL },
   { TT_EGREP,    zBroken_Assert_StdlibSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Broken_Assert_Stdlib
  */
-const char* apzBroken_Assert_StdlibPatch[] = {
+static const char* apzBroken_Assert_StdlibPatch[] = {
     "wrap",
     "#ifdef __cplusplus\n\
 #include <stdlib.h>\n\
@@ -1513,13 +1513,13 @@ tSCC zBroken_CabsSelect0[] =
        "^extern double cabs";
 
 #define    BROKEN_CABS_TEST_CT  1
-tTestDesc aBroken_CabsTests[] = {
+static tTestDesc aBroken_CabsTests[] = {
   { TT_EGREP,    zBroken_CabsSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Broken_Cabs
  */
-const char* apzBroken_CabsPatch[] = {
+static const char* apzBroken_CabsPatch[] = {
     "format",
     "",
     "^extern double cabs\\((struct dbl_hypot|)\\);",
@@ -1549,13 +1549,13 @@ tSCC zCtrl_Quotes_DefSelect0[] =
        "define[ \t]+[A-Z0-9_]+CTRL\\([a-zA-Z][,)]";
 
 #define    CTRL_QUOTES_DEF_TEST_CT  1
-tTestDesc aCtrl_Quotes_DefTests[] = {
+static tTestDesc aCtrl_Quotes_DefTests[] = {
   { TT_EGREP,    zCtrl_Quotes_DefSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Ctrl_Quotes_Def
  */
-const char* apzCtrl_Quotes_DefPatch[] = {
+static const char* apzCtrl_Quotes_DefPatch[] = {
     "char_macro_def",
     "CTRL",
     (char*)NULL };
@@ -1584,13 +1584,13 @@ tSCC zCtrl_Quotes_UseSelect0[] =
        "define[ \t]+[A-Z0-9_]+[ \t]+[A-Z0-9_]+CTRL[ \t]*\\( *[^,']";
 
 #define    CTRL_QUOTES_USE_TEST_CT  1
-tTestDesc aCtrl_Quotes_UseTests[] = {
+static tTestDesc aCtrl_Quotes_UseTests[] = {
   { TT_EGREP,    zCtrl_Quotes_UseSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Ctrl_Quotes_Use
  */
-const char* apzCtrl_Quotes_UsePatch[] = {
+static const char* apzCtrl_Quotes_UsePatch[] = {
     "char_macro_use",
     "CTRL",
     (char*)NULL };
@@ -1626,14 +1626,14 @@ tSCC zCxx_UnreadyBypass0[] =
        "\"C\"|__BEGIN_DECLS";
 
 #define    CXX_UNREADY_TEST_CT  2
-tTestDesc aCxx_UnreadyTests[] = {
+static tTestDesc aCxx_UnreadyTests[] = {
   { TT_NEGREP,   zCxx_UnreadyBypass0, (regex_t*)NULL },
   { TT_EGREP,    zCxx_UnreadySelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Cxx_Unready
  */
-const char* apzCxx_UnreadyPatch[] = {
+static const char* apzCxx_UnreadyPatch[] = {
     "wrap",
     "#ifdef __cplusplus\n\
 extern \"C\" {\n\
@@ -1666,7 +1666,7 @@ tSCC zDec_Intern_AsmList[] =
 /*
  *  Fix Command Arguments for Dec_Intern_Asm
  */
-const char* apzDec_Intern_AsmPatch[] = { "sed",
+static const char* apzDec_Intern_AsmPatch[] = { "sed",
     "-e", "/^[ \t]*float[ \t]*fasm/i\\\n\
 #ifdef __DECC\n",
     "-e", "/^[ \t]*#[ \t]*pragma[ \t]*intrinsic([ \t]*dasm/a\\\n\
@@ -1698,13 +1698,13 @@ tSCC zEcd_CursorSelect0[] =
        "ecd\\.cursor";
 
 #define    ECD_CURSOR_TEST_CT  1
-tTestDesc aEcd_CursorTests[] = {
+static tTestDesc aEcd_CursorTests[] = {
   { TT_EGREP,    zEcd_CursorSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Ecd_Cursor
  */
-const char* apzEcd_CursorPatch[] = {
+static const char* apzEcd_CursorPatch[] = {
     "format",
     "ecd_cursor",
     (char*)NULL };
@@ -1736,13 +1736,13 @@ tSCC zFix_Header_BreakageSelect0[] =
        "extern double floor\\(\\), ceil\\(\\), fmod\\(\\), fabs\\(\\);";
 
 #define    FIX_HEADER_BREAKAGE_TEST_CT  1
-tTestDesc aFix_Header_BreakageTests[] = {
+static tTestDesc aFix_Header_BreakageTests[] = {
   { TT_EGREP,    zFix_Header_BreakageSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Fix_Header_Breakage
  */
-const char* apzFix_Header_BreakagePatch[] = {
+static const char* apzFix_Header_BreakagePatch[] = {
     "format",
     "extern double floor(), ceil(), fmod(), fabs _PARAMS((double));",
     (char*)NULL };
@@ -1772,13 +1772,13 @@ tSCC zHp_InlineSelect0[] =
        "[ \t]*#[ \t]*include[ \t]+\"\\.\\./machine/";
 
 #define    HP_INLINE_TEST_CT  1
-tTestDesc aHp_InlineTests[] = {
+static tTestDesc aHp_InlineTests[] = {
   { TT_EGREP,    zHp_InlineSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Hp_Inline
  */
-const char* apzHp_InlinePatch[] = {
+static const char* apzHp_InlinePatch[] = {
     "format",
     "%1<machine/%2.h>",
     "([ \t]*#[ \t]*include[ \t]+)\"\\.\\./machine/([a-z]+)\\.h\"",
@@ -1809,13 +1809,13 @@ tSCC zHp_SysfileSelect0[] =
        "HPUX_SOURCE";
 
 #define    HP_SYSFILE_TEST_CT  1
-tTestDesc aHp_SysfileTests[] = {
+static tTestDesc aHp_SysfileTests[] = {
   { TT_EGREP,    zHp_SysfileSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Hp_Sysfile
  */
-const char* apzHp_SysfilePatch[] = {
+static const char* apzHp_SysfilePatch[] = {
     "format",
     "(struct file *, ...)",
     "\\(\\.\\.\\.\\)",
@@ -1852,14 +1852,14 @@ tSCC zHpux11_FabsfBypass0[] =
        "__cplusplus";
 
 #define    HPUX11_FABSF_TEST_CT  2
-tTestDesc aHpux11_FabsfTests[] = {
+static tTestDesc aHpux11_FabsfTests[] = {
   { TT_NEGREP,   zHpux11_FabsfBypass0, (regex_t*)NULL },
   { TT_EGREP,    zHpux11_FabsfSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Hpux11_Fabsf
  */
-const char* apzHpux11_FabsfPatch[] = {
+static const char* apzHpux11_FabsfPatch[] = {
     "format",
     "#ifndef __cplusplus\n\
 %0\n\
@@ -1891,13 +1891,13 @@ tSCC zHpux11_Uint32_CSelect0[] =
        "^#define UINT32_C\\(__c\\)[ \t]*__CONCAT__\\(__CONCAT_U__\\(__c\\),l\\)";
 
 #define    HPUX11_UINT32_C_TEST_CT  1
-tTestDesc aHpux11_Uint32_CTests[] = {
+static tTestDesc aHpux11_Uint32_CTests[] = {
   { TT_EGREP,    zHpux11_Uint32_CSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Hpux11_Uint32_C
  */
-const char* apzHpux11_Uint32_CPatch[] = {
+static const char* apzHpux11_Uint32_CPatch[] = {
     "format",
     "#define UINT32_C(__c) __CONCAT__(__c,ul)",
     (char*)NULL };
@@ -1927,13 +1927,13 @@ tSCC zHpux8_Bogus_InlinesSelect0[] =
        "inline";
 
 #define    HPUX8_BOGUS_INLINES_TEST_CT  1
-tTestDesc aHpux8_Bogus_InlinesTests[] = {
+static tTestDesc aHpux8_Bogus_InlinesTests[] = {
   { TT_EGREP,    zHpux8_Bogus_InlinesSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Hpux8_Bogus_Inlines
  */
-const char* apzHpux8_Bogus_InlinesPatch[] = { "sed",
+static const char* apzHpux8_Bogus_InlinesPatch[] = { "sed",
     "-e", "s@inline int abs(int [a-z][a-z]*) {.*}@extern \"C\" int abs(int);@",
     "-e", "s@inline double abs(double [a-z][a-z]*) {.*}@@",
     "-e", "s@inline int sqr(int [a-z][a-z]*) {.*}@@",
@@ -1965,13 +1965,13 @@ tSCC zInt_Abort_Free_And_ExitSelect0[] =
        "int[ \t]+(abort|free|exit)[ \t]*\\(";
 
 #define    INT_ABORT_FREE_AND_EXIT_TEST_CT  1
-tTestDesc aInt_Abort_Free_And_ExitTests[] = {
+static tTestDesc aInt_Abort_Free_And_ExitTests[] = {
   { TT_EGREP,    zInt_Abort_Free_And_ExitSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Int_Abort_Free_And_Exit
  */
-const char* apzInt_Abort_Free_And_ExitPatch[] = {
+static const char* apzInt_Abort_Free_And_ExitPatch[] = {
     "format",
     "void\t%1(",
     (char*)NULL };
@@ -2001,13 +2001,13 @@ tSCC zIsc_Omits_With_StdcSelect0[] =
        "!defined\\(__STDC__\\) && !defined\\(_POSIX_SOURCE\\)";
 
 #define    ISC_OMITS_WITH_STDC_TEST_CT  1
-tTestDesc aIsc_Omits_With_StdcTests[] = {
+static tTestDesc aIsc_Omits_With_StdcTests[] = {
   { TT_EGREP,    zIsc_Omits_With_StdcSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Isc_Omits_With_Stdc
  */
-const char* apzIsc_Omits_With_StdcPatch[] = {
+static const char* apzIsc_Omits_With_StdcPatch[] = {
     "format",
     "!defined(_POSIX_SOURCE)",
     (char*)NULL };
@@ -2036,13 +2036,13 @@ tSCC zIo_Quotes_DefSelect0[] =
        "define[ \t]+[A-Z0-9_]+IO[A-Z]*\\([a-zA-Z][,)]";
 
 #define    IO_QUOTES_DEF_TEST_CT  1
-tTestDesc aIo_Quotes_DefTests[] = {
+static tTestDesc aIo_Quotes_DefTests[] = {
   { TT_EGREP,    zIo_Quotes_DefSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Io_Quotes_Def
  */
-const char* apzIo_Quotes_DefPatch[] = {
+static const char* apzIo_Quotes_DefPatch[] = {
     "char_macro_def",
     "IO",
     (char*)NULL };
@@ -2071,13 +2071,13 @@ tSCC zIo_Quotes_UseSelect0[] =
        "define[ \t]+[A-Z0-9_]+[ \t]+[A-Z0-9_]+IO[A-Z]*[ \t]*\\( *[^,']";
 
 #define    IO_QUOTES_USE_TEST_CT  1
-tTestDesc aIo_Quotes_UseTests[] = {
+static tTestDesc aIo_Quotes_UseTests[] = {
   { TT_EGREP,    zIo_Quotes_UseSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Io_Quotes_Use
  */
-const char* apzIo_Quotes_UsePatch[] = {
+static const char* apzIo_Quotes_UsePatch[] = {
     "char_macro_use",
     "IO",
     (char*)NULL };
@@ -2107,13 +2107,13 @@ tSCC zHpux_MaxintSelect0[] =
        "^#[ \t]*define[ \t]*MAXINT[ \t]";
 
 #define    HPUX_MAXINT_TEST_CT  1
-tTestDesc aHpux_MaxintTests[] = {
+static tTestDesc aHpux_MaxintTests[] = {
   { TT_EGREP,    zHpux_MaxintSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Hpux_Maxint
  */
-const char* apzHpux_MaxintPatch[] = {
+static const char* apzHpux_MaxintPatch[] = {
     "format",
     "#ifndef MAXINT\n\
 %0\n\
@@ -2146,13 +2146,13 @@ tSCC zHpux_SystimeSelect0[] =
        "^extern struct sigevent;";
 
 #define    HPUX_SYSTIME_TEST_CT  1
-tTestDesc aHpux_SystimeTests[] = {
+static tTestDesc aHpux_SystimeTests[] = {
   { TT_EGREP,    zHpux_SystimeSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Hpux_Systime
  */
-const char* apzHpux_SystimePatch[] = {
+static const char* apzHpux_SystimePatch[] = {
     "format",
     "struct sigevent;",
     (char*)NULL };
@@ -2182,13 +2182,13 @@ tSCC zIp_Missing_SemiSelect0[] =
        "}$";
 
 #define    IP_MISSING_SEMI_TEST_CT  1
-tTestDesc aIp_Missing_SemiTests[] = {
+static tTestDesc aIp_Missing_SemiTests[] = {
   { TT_EGREP,    zIp_Missing_SemiSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Ip_Missing_Semi
  */
-const char* apzIp_Missing_SemiPatch[] = { "sed",
+static const char* apzIp_Missing_SemiPatch[] = { "sed",
     "-e", "/^struct/,/^};/s/}$/};/",
     (char*)NULL };
 
@@ -2217,13 +2217,13 @@ tSCC zIrix_Asm_ApostropheSelect0[] =
        "^[ \t]*#.*[Ww]e're";
 
 #define    IRIX_ASM_APOSTROPHE_TEST_CT  1
-tTestDesc aIrix_Asm_ApostropheTests[] = {
+static tTestDesc aIrix_Asm_ApostropheTests[] = {
   { TT_EGREP,    zIrix_Asm_ApostropheSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Irix_Asm_Apostrophe
  */
-const char* apzIrix_Asm_ApostrophePatch[] = {
+static const char* apzIrix_Asm_ApostrophePatch[] = {
     "format",
     "%1 are",
     "^([ \t]*#.*[Ww]e)'re",
@@ -2254,13 +2254,13 @@ tSCC zIsc_FmodSelect0[] =
        "fmod\\(double\\)";
 
 #define    ISC_FMOD_TEST_CT  1
-tTestDesc aIsc_FmodTests[] = {
+static tTestDesc aIsc_FmodTests[] = {
   { TT_EGREP,    zIsc_FmodSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Isc_Fmod
  */
-const char* apzIsc_FmodPatch[] = {
+static const char* apzIsc_FmodPatch[] = {
     "format",
     "fmod(double, double)",
     (char*)NULL };
@@ -2290,13 +2290,13 @@ tSCC zKandr_ConcatSelect0[] =
        "/\\*\\*/";
 
 #define    KANDR_CONCAT_TEST_CT  1
-tTestDesc aKandr_ConcatTests[] = {
+static tTestDesc aKandr_ConcatTests[] = {
   { TT_EGREP,    zKandr_ConcatSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Kandr_Concat
  */
-const char* apzKandr_ConcatPatch[] = {
+static const char* apzKandr_ConcatPatch[] = {
     "format",
     "##",
     (char*)NULL };
@@ -2332,14 +2332,14 @@ tSCC zLibc1_Ifdefd_MemxBypass0[] =
        "__cplusplus";
 
 #define    LIBC1_IFDEFD_MEMX_TEST_CT  2
-tTestDesc aLibc1_Ifdefd_MemxTests[] = {
+static tTestDesc aLibc1_Ifdefd_MemxTests[] = {
   { TT_NEGREP,   zLibc1_Ifdefd_MemxBypass0, (regex_t*)NULL },
   { TT_EGREP,    zLibc1_Ifdefd_MemxSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Libc1_Ifdefd_Memx
  */
-const char* apzLibc1_Ifdefd_MemxPatch[] = {
+static const char* apzLibc1_Ifdefd_MemxPatch[] = {
     "format",
     "%1",
     "/\\* `mem...' is a built-in function for gcc 2\\.x\\. \\*/\n\
@@ -2375,13 +2375,13 @@ tSCC zLimits_IfndefsBypass0[] =
        "ifndef[ \t]+FLT_MIN";
 
 #define    LIMITS_IFNDEFS_TEST_CT  1
-tTestDesc aLimits_IfndefsTests[] = {
+static tTestDesc aLimits_IfndefsTests[] = {
   { TT_NEGREP,   zLimits_IfndefsBypass0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Limits_Ifndefs
  */
-const char* apzLimits_IfndefsPatch[] = {
+static const char* apzLimits_IfndefsPatch[] = {
     "format",
     "#ifndef %1\n\
 %0\n\
@@ -2414,13 +2414,13 @@ tSCC zLynx_Void_IntSelect0[] =
        "#[ \t]*define[ \t]+void[ \t]+int[ \t]*";
 
 #define    LYNX_VOID_INT_TEST_CT  1
-tTestDesc aLynx_Void_IntTests[] = {
+static tTestDesc aLynx_Void_IntTests[] = {
   { TT_EGREP,    zLynx_Void_IntSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Lynx_Void_Int
  */
-const char* apzLynx_Void_IntPatch[] = {
+static const char* apzLynx_Void_IntPatch[] = {
     "format",
     "",
     (char*)NULL };
@@ -2450,13 +2450,13 @@ tSCC zLynxos_Fcntl_ProtoSelect0[] =
        "fcntl[ \t]*\\(int, int, int\\)";
 
 #define    LYNXOS_FCNTL_PROTO_TEST_CT  1
-tTestDesc aLynxos_Fcntl_ProtoTests[] = {
+static tTestDesc aLynxos_Fcntl_ProtoTests[] = {
   { TT_EGREP,    zLynxos_Fcntl_ProtoSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Lynxos_Fcntl_Proto
  */
-const char* apzLynxos_Fcntl_ProtoPatch[] = {
+static const char* apzLynxos_Fcntl_ProtoPatch[] = {
     "format",
     "%1...)",
     "(fcntl[ \t]*\\(int, int, )int\\)",
@@ -2489,13 +2489,13 @@ tSCC zM88k_Bad_Hypot_OptSelect0[] =
        "^extern double hypot\\(\\);\n";
 
 #define    M88K_BAD_HYPOT_OPT_TEST_CT  1
-tTestDesc aM88k_Bad_Hypot_OptTests[] = {
+static tTestDesc aM88k_Bad_Hypot_OptTests[] = {
   { TT_EGREP,    zM88k_Bad_Hypot_OptSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for M88k_Bad_Hypot_Opt
  */
-const char* apzM88k_Bad_Hypot_OptPatch[] = {
+static const char* apzM88k_Bad_Hypot_OptPatch[] = {
     "format",
     "%0/* Workaround a stupid Motorola optimization if one\n\
    of x or y is 0.0 and the other is negative!  */\n\
@@ -2538,13 +2538,13 @@ tSCC zM88k_Bad_S_IfSelect0[] =
        "#define[ \t]+S_IS[A-Z]+\\(m\\)[ \t]+\\(m[ \t]*&";
 
 #define    M88K_BAD_S_IF_TEST_CT  1
-tTestDesc aM88k_Bad_S_IfTests[] = {
+static tTestDesc aM88k_Bad_S_IfTests[] = {
   { TT_EGREP,    zM88k_Bad_S_IfSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for M88k_Bad_S_If
  */
-const char* apzM88k_Bad_S_IfPatch[] = {
+static const char* apzM88k_Bad_S_IfPatch[] = {
     "format",
     "#define %1(m) (((m) & S_IFMT) == %2)",
     "#define[ \t]+(S_IS[A-Z]+)\\(m\\)[ \t]+\\(m[ \t]*&[ \t]*(S_IF[A-Z][A-Z][A-Z]+|0[0-9]+)[ \t]*\\)",
@@ -2577,13 +2577,13 @@ tSCC zM88k_Multi_InclBypass0[] =
        "#ifndef";
 
 #define    M88K_MULTI_INCL_TEST_CT  1
-tTestDesc aM88k_Multi_InclTests[] = {
+static tTestDesc aM88k_Multi_InclTests[] = {
   { TT_NEGREP,   zM88k_Multi_InclBypass0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for M88k_Multi_Incl
  */
-const char* apzM88k_Multi_InclPatch[] = {
+static const char* apzM88k_Multi_InclPatch[] = {
     "wrap",
     (char*)NULL };
 
@@ -2618,14 +2618,14 @@ tSCC zMachine_Ansi_H_Va_ListBypass0[] =
        "__builtin_va_list";
 
 #define    MACHINE_ANSI_H_VA_LIST_TEST_CT  2
-tTestDesc aMachine_Ansi_H_Va_ListTests[] = {
+static tTestDesc aMachine_Ansi_H_Va_ListTests[] = {
   { TT_NEGREP,   zMachine_Ansi_H_Va_ListBypass0, (regex_t*)NULL },
   { TT_EGREP,    zMachine_Ansi_H_Va_ListSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Machine_Ansi_H_Va_List
  */
-const char* apzMachine_Ansi_H_Va_ListPatch[] = {
+static const char* apzMachine_Ansi_H_Va_ListPatch[] = {
     "format",
     "%1__builtin_va_list",
     "(define[ \t]+_BSD_VA_LIST_[ \t]+).*",
@@ -2654,13 +2654,13 @@ tSCC zMachine_NameName[] =
 tSCC zMachine_NameFTst0[] = "machine_name";
 
 #define    MACHINE_NAME_TEST_CT  1
-tTestDesc aMachine_NameTests[] = {
+static tTestDesc aMachine_NameTests[] = {
   { TT_FUNCTION, zMachine_NameFTst0,   0 /* unused */ }, };
 
 /*
  *  Fix Command Arguments for Machine_Name
  */
-const char* apzMachine_NamePatch[] = {
+static const char* apzMachine_NamePatch[] = {
     "machine_name",
     (char*)NULL };
 
@@ -2695,14 +2695,14 @@ tSCC zMath_ExceptionBypass0[] =
        "We have a problem when using C\\+\\+";
 
 #define    MATH_EXCEPTION_TEST_CT  2
-tTestDesc aMath_ExceptionTests[] = {
+static tTestDesc aMath_ExceptionTests[] = {
   { TT_NEGREP,   zMath_ExceptionBypass0, (regex_t*)NULL },
   { TT_EGREP,    zMath_ExceptionSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Math_Exception
  */
-const char* apzMath_ExceptionPatch[] = {
+static const char* apzMath_ExceptionPatch[] = {
     "wrap",
     "#ifdef __cplusplus\n\
 #define exception __math_exception\n\
@@ -2743,14 +2743,14 @@ tSCC zMath_Huge_Val_From_Dbl_MaxBypass0[] =
        "define[ \t]+DBL_MAX";
 
 #define    MATH_HUGE_VAL_FROM_DBL_MAX_TEST_CT  2
-tTestDesc aMath_Huge_Val_From_Dbl_MaxTests[] = {
+static tTestDesc aMath_Huge_Val_From_Dbl_MaxTests[] = {
   { TT_NEGREP,   zMath_Huge_Val_From_Dbl_MaxBypass0, (regex_t*)NULL },
   { TT_EGREP,    zMath_Huge_Val_From_Dbl_MaxSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Math_Huge_Val_From_Dbl_Max
  */
-const char* apzMath_Huge_Val_From_Dbl_MaxPatch[] = { "sh", "-c",
+static const char* apzMath_Huge_Val_From_Dbl_MaxPatch[] = { "sh", "-c",
     "\tdbl_max_def=`egrep 'define[ \t]+DBL_MAX[ \t]+.*' float.h | sed 's/.*DBL_MAX[ \t]*//' 2>/dev/null`\n\
 \n\
 \tif ( test -n \"${dbl_max_def}\" ) > /dev/null 2>&1\n\
@@ -2784,13 +2784,13 @@ tSCC zMath_Huge_Val_IfndefSelect0[] =
        "define[ \t]+HUGE_VAL";
 
 #define    MATH_HUGE_VAL_IFNDEF_TEST_CT  1
-tTestDesc aMath_Huge_Val_IfndefTests[] = {
+static tTestDesc aMath_Huge_Val_IfndefTests[] = {
   { TT_EGREP,    zMath_Huge_Val_IfndefSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Math_Huge_Val_Ifndef
  */
-const char* apzMath_Huge_Val_IfndefPatch[] = {
+static const char* apzMath_Huge_Val_IfndefPatch[] = {
     "format",
     "#ifndef HUGE_VAL\n\
 %0\n\
@@ -2825,13 +2825,13 @@ tSCC zNested_MotorolaSelect0[] =
        "max # bytes atomic in write|error value returned by Math lib";
 
 #define    NESTED_MOTOROLA_TEST_CT  1
-tTestDesc aNested_MotorolaTests[] = {
+static tTestDesc aNested_MotorolaTests[] = {
   { TT_EGREP,    zNested_MotorolaSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Nested_Motorola
  */
-const char* apzNested_MotorolaPatch[] = { "sed",
+static const char* apzNested_MotorolaPatch[] = { "sed",
     "-e", "s@^\\(#undef[ \t][ \t]*PIPE_BUF[ \t]*/\\* max # bytes atomic in write to a\\)$@\\1 */@",
     "-e", "s@\\(/\\*#define\tHUGE_VAL\t3.[0-9e+]* \\)\\(/\\*error value returned by Math lib\\*/\\)$@\\1*/ \\2@",
     (char*)NULL };
@@ -2861,13 +2861,13 @@ tSCC zNested_Sys_LimitsSelect0[] =
        "CHILD_MAX";
 
 #define    NESTED_SYS_LIMITS_TEST_CT  1
-tTestDesc aNested_Sys_LimitsTests[] = {
+static tTestDesc aNested_Sys_LimitsTests[] = {
   { TT_EGREP,    zNested_Sys_LimitsSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Nested_Sys_Limits
  */
-const char* apzNested_Sys_LimitsPatch[] = { "sed",
+static const char* apzNested_Sys_LimitsPatch[] = { "sed",
     "-e", "/CHILD_MAX/s,/\\* Max, Max,",
     "-e", "/OPEN_MAX/s,/\\* Max, Max,",
     (char*)NULL };
@@ -2897,13 +2897,13 @@ tSCC zNested_Auth_DesSelect0[] =
        "(/\\*.*rpc/auth_des\\.h>.*)/\\*";
 
 #define    NESTED_AUTH_DES_TEST_CT  1
-tTestDesc aNested_Auth_DesTests[] = {
+static tTestDesc aNested_Auth_DesTests[] = {
   { TT_EGREP,    zNested_Auth_DesSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Nested_Auth_Des
  */
-const char* apzNested_Auth_DesPatch[] = {
+static const char* apzNested_Auth_DesPatch[] = {
     "format",
     "%1*/ /*",
     (char*)NULL };
@@ -2933,13 +2933,13 @@ tSCC zNews_Os_RecursionSelect0[] =
        "[ \t]*#include <stdlib\\.h>.*";
 
 #define    NEWS_OS_RECURSION_TEST_CT  1
-tTestDesc aNews_Os_RecursionTests[] = {
+static tTestDesc aNews_Os_RecursionTests[] = {
   { TT_EGREP,    zNews_Os_RecursionSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for News_Os_Recursion
  */
-const char* apzNews_Os_RecursionPatch[] = {
+static const char* apzNews_Os_RecursionPatch[] = {
     "format",
     "#ifdef BOGUS_RECURSION\n\
 %0\n\
@@ -2971,13 +2971,13 @@ tSCC zNext_Math_PrefixSelect0[] =
        "^extern[ \t]+double[ \t]+__const__[ \t]";
 
 #define    NEXT_MATH_PREFIX_TEST_CT  1
-tTestDesc aNext_Math_PrefixTests[] = {
+static tTestDesc aNext_Math_PrefixTests[] = {
   { TT_EGREP,    zNext_Math_PrefixSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Next_Math_Prefix
  */
-const char* apzNext_Math_PrefixPatch[] = {
+static const char* apzNext_Math_PrefixPatch[] = {
     "format",
     "extern double %1(",
     "^extern[ \t]+double[ \t]+__const__[ \t]+([a-z]+)\\(",
@@ -3008,13 +3008,13 @@ tSCC zNext_TemplateSelect0[] =
        "[ \t]template\\)";
 
 #define    NEXT_TEMPLATE_TEST_CT  1
-tTestDesc aNext_TemplateTests[] = {
+static tTestDesc aNext_TemplateTests[] = {
   { TT_EGREP,    zNext_TemplateSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Next_Template
  */
-const char* apzNext_TemplatePatch[] = {
+static const char* apzNext_TemplatePatch[] = {
     "format",
     "(%1)",
     "\\(([^)]*)[ \t]template\\)",
@@ -3045,13 +3045,13 @@ tSCC zNext_VolitileSelect0[] =
        "^extern[ \t]+volatile[ \t]+void[ \t]";
 
 #define    NEXT_VOLITILE_TEST_CT  1
-tTestDesc aNext_VolitileTests[] = {
+static tTestDesc aNext_VolitileTests[] = {
   { TT_EGREP,    zNext_VolitileSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Next_Volitile
  */
-const char* apzNext_VolitilePatch[] = {
+static const char* apzNext_VolitilePatch[] = {
     "format",
     "extern void %1(",
     "^extern[ \t]+volatile[ \t]+void[ \t]+(exit|abort)\\(",
@@ -3082,13 +3082,13 @@ tSCC zNext_Wait_UnionSelect0[] =
        "wait\\(union wait";
 
 #define    NEXT_WAIT_UNION_TEST_CT  1
-tTestDesc aNext_Wait_UnionTests[] = {
+static tTestDesc aNext_Wait_UnionTests[] = {
   { TT_EGREP,    zNext_Wait_UnionSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Next_Wait_Union
  */
-const char* apzNext_Wait_UnionPatch[] = {
+static const char* apzNext_Wait_UnionPatch[] = {
     "format",
     "wait(void",
     (char*)NULL };
@@ -3118,13 +3118,13 @@ tSCC zNodeent_SyntaxSelect0[] =
        "char[ \t]*\\*na_addr[ \t]*$";
 
 #define    NODEENT_SYNTAX_TEST_CT  1
-tTestDesc aNodeent_SyntaxTests[] = {
+static tTestDesc aNodeent_SyntaxTests[] = {
   { TT_EGREP,    zNodeent_SyntaxSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Nodeent_Syntax
  */
-const char* apzNodeent_SyntaxPatch[] = {
+static const char* apzNodeent_SyntaxPatch[] = {
     "format",
     "%0;",
     (char*)NULL };
@@ -3160,7 +3160,7 @@ tSCC zOsf_Namespace_ATest3[] =
        " -z \"`grep __regex_t regex.h`\"";
 
 #define    OSF_NAMESPACE_A_TEST_CT  4
-tTestDesc aOsf_Namespace_ATests[] = {
+static tTestDesc aOsf_Namespace_ATests[] = {
   { TT_TEST,     zOsf_Namespace_ATest0,   0 /* unused */ },
   { TT_TEST,     zOsf_Namespace_ATest1,   0 /* unused */ },
   { TT_TEST,     zOsf_Namespace_ATest2,   0 /* unused */ },
@@ -3169,7 +3169,7 @@ tTestDesc aOsf_Namespace_ATests[] = {
 /*
  *  Fix Command Arguments for Osf_Namespace_A
  */
-const char* apzOsf_Namespace_APatch[] = {
+static const char* apzOsf_Namespace_APatch[] = {
     "format",
     "__%0",
     "reg(ex|off|match)_t",
@@ -3212,7 +3212,7 @@ tSCC zOsf_Namespace_CTest3[] =
        " -z \"`grep __regex_t regex.h`\"";
 
 #define    OSF_NAMESPACE_C_TEST_CT  5
-tTestDesc aOsf_Namespace_CTests[] = {
+static tTestDesc aOsf_Namespace_CTests[] = {
   { TT_TEST,     zOsf_Namespace_CTest0,   0 /* unused */ },
   { TT_TEST,     zOsf_Namespace_CTest1,   0 /* unused */ },
   { TT_TEST,     zOsf_Namespace_CTest2,   0 /* unused */ },
@@ -3222,7 +3222,7 @@ tTestDesc aOsf_Namespace_CTests[] = {
 /*
  *  Fix Command Arguments for Osf_Namespace_C
  */
-const char* apzOsf_Namespace_CPatch[] = {
+static const char* apzOsf_Namespace_CPatch[] = {
     "format",
     "%0\n\
 typedef __regex_t\tregex_t;\n\
@@ -3255,13 +3255,13 @@ tSCC zPthread_Page_SizeSelect0[] =
        "^int __page_size";
 
 #define    PTHREAD_PAGE_SIZE_TEST_CT  1
-tTestDesc aPthread_Page_SizeTests[] = {
+static tTestDesc aPthread_Page_SizeTests[] = {
   { TT_EGREP,    zPthread_Page_SizeSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Pthread_Page_Size
  */
-const char* apzPthread_Page_SizePatch[] = {
+static const char* apzPthread_Page_SizePatch[] = {
     "format",
     "extern %0",
     (char*)NULL };
@@ -3291,13 +3291,13 @@ tSCC zRead_Ret_TypeSelect0[] =
        "extern int\t.*, fread\\(\\), fwrite\\(\\)";
 
 #define    READ_RET_TYPE_TEST_CT  1
-tTestDesc aRead_Ret_TypeTests[] = {
+static tTestDesc aRead_Ret_TypeTests[] = {
   { TT_EGREP,    zRead_Ret_TypeSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Read_Ret_Type
  */
-const char* apzRead_Ret_TypePatch[] = {
+static const char* apzRead_Ret_TypePatch[] = {
     "format",
     "extern unsigned int fread(), fwrite();\n\
 %1%2",
@@ -3329,13 +3329,13 @@ tSCC zRs6000_DoubleSelect0[] =
        "[^a-zA-Z_]class\\(";
 
 #define    RS6000_DOUBLE_TEST_CT  1
-tTestDesc aRs6000_DoubleTests[] = {
+static tTestDesc aRs6000_DoubleTests[] = {
   { TT_EGREP,    zRs6000_DoubleSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Rs6000_Double
  */
-const char* apzRs6000_DoublePatch[] = {
+static const char* apzRs6000_DoublePatch[] = {
     "format",
     "#ifndef __cplusplus\n\
 %0\n\
@@ -3368,13 +3368,13 @@ tSCC zRs6000_FchmodSelect0[] =
        "fchmod\\(char \\*";
 
 #define    RS6000_FCHMOD_TEST_CT  1
-tTestDesc aRs6000_FchmodTests[] = {
+static tTestDesc aRs6000_FchmodTests[] = {
   { TT_EGREP,    zRs6000_FchmodSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Rs6000_Fchmod
  */
-const char* apzRs6000_FchmodPatch[] = {
+static const char* apzRs6000_FchmodPatch[] = {
     "format",
     "fchmod(int",
     (char*)NULL };
@@ -3404,13 +3404,13 @@ tSCC zRs6000_ParamSelect0[] =
        "rename\\(const char \\*old, const char \\*new\\)";
 
 #define    RS6000_PARAM_TEST_CT  1
-tTestDesc aRs6000_ParamTests[] = {
+static tTestDesc aRs6000_ParamTests[] = {
   { TT_EGREP,    zRs6000_ParamSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Rs6000_Param
  */
-const char* apzRs6000_ParamPatch[] = {
+static const char* apzRs6000_ParamPatch[] = {
     "format",
     "rename(const char *_old, const char *_new)",
     (char*)NULL };
@@ -3442,13 +3442,13 @@ tSCC zSco_Static_FuncSelect0[] =
        "^static int";
 
 #define    SCO_STATIC_FUNC_TEST_CT  1
-tTestDesc aSco_Static_FuncTests[] = {
+static tTestDesc aSco_Static_FuncTests[] = {
   { TT_EGREP,    zSco_Static_FuncSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Sco_Static_Func
  */
-const char* apzSco_Static_FuncPatch[] = { "sed",
+static const char* apzSco_Static_FuncPatch[] = { "sed",
     "-e", "/^static int/i\\\n\
 #if __cplusplus\\\n\
 extern \"C\" {\\\n\
@@ -3485,13 +3485,13 @@ tSCC zSco_Strict_AnsiSelect0[] =
        "^[ \t]*#[ \t]*if.*!__STDC__";
 
 #define    SCO_STRICT_ANSI_TEST_CT  1
-tTestDesc aSco_Strict_AnsiTests[] = {
+static tTestDesc aSco_Strict_AnsiTests[] = {
   { TT_EGREP,    zSco_Strict_AnsiSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Sco_Strict_Ansi
  */
-const char* apzSco_Strict_AnsiPatch[] = {
+static const char* apzSco_Strict_AnsiPatch[] = {
     "format",
     "%1defined(__STRICT_ANSI__)%2",
     "^([ \t]*#[ \t]*if[ \t].*!)__STDC__(.*)",
@@ -3524,13 +3524,13 @@ tSCC zSco_UtimeSelect0[] =
        "\\(const char \\*, struct utimbuf \\*\\);";
 
 #define    SCO_UTIME_TEST_CT  1
-tTestDesc aSco_UtimeTests[] = {
+static tTestDesc aSco_UtimeTests[] = {
   { TT_EGREP,    zSco_UtimeSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Sco_Utime
  */
-const char* apzSco_UtimePatch[] = {
+static const char* apzSco_UtimePatch[] = {
     "format",
     "(const char *, const struct utimbuf *);",
     (char*)NULL };
@@ -3560,13 +3560,13 @@ tSCC zStatsswtchSelect0[] =
        "boottime$";
 
 #define    STATSSWTCH_TEST_CT  1
-tTestDesc aStatsswtchTests[] = {
+static tTestDesc aStatsswtchTests[] = {
   { TT_EGREP,    zStatsswtchSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Statsswtch
  */
-const char* apzStatsswtchPatch[] = {
+static const char* apzStatsswtchPatch[] = {
     "format",
     "boottime;",
     (char*)NULL };
@@ -3596,13 +3596,13 @@ tSCC zStdio_Stdarg_HBypass0[] =
        "include.*(stdarg.h|machine/ansi.h)";
 
 #define    STDIO_STDARG_H_TEST_CT  1
-tTestDesc aStdio_Stdarg_HTests[] = {
+static tTestDesc aStdio_Stdarg_HTests[] = {
   { TT_NEGREP,   zStdio_Stdarg_HBypass0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Stdio_Stdarg_H
  */
-const char* apzStdio_Stdarg_HPatch[] = {
+static const char* apzStdio_Stdarg_HPatch[] = {
     "wrap",
     "#define __need___va_list\n\
 #include <stdarg.h>\n",
@@ -3633,13 +3633,13 @@ tSCC zStdio_Va_ListBypass0[] =
        "__gnuc_va_list|_BSD_VA_LIST_";
 
 #define    STDIO_VA_LIST_TEST_CT  1
-tTestDesc aStdio_Va_ListTests[] = {
+static tTestDesc aStdio_Va_ListTests[] = {
   { TT_NEGREP,   zStdio_Va_ListBypass0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Stdio_Va_List
  */
-const char* apzStdio_Va_ListPatch[] = { "sed",
+static const char* apzStdio_Va_ListPatch[] = { "sed",
     "-e", "s@ va_list @ __gnuc_va_list @\n\
 s@ va_list)@ __gnuc_va_list)@\n\
 s@ _VA_LIST_));@ __gnuc_va_list));@\n\
@@ -3678,13 +3678,13 @@ tSCC zStruct_FileSelect0[] =
        "^.*xdrstdio_create.*struct __file_s";
 
 #define    STRUCT_FILE_TEST_CT  1
-tTestDesc aStruct_FileTests[] = {
+static tTestDesc aStruct_FileTests[] = {
   { TT_EGREP,    zStruct_FileSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Struct_File
  */
-const char* apzStruct_FilePatch[] = {
+static const char* apzStruct_FilePatch[] = {
     "format",
     "struct __file_s;\n\
 %0",
@@ -3721,14 +3721,14 @@ tSCC zStruct_SockaddrBypass0[] =
        "<sys/socket.h>";
 
 #define    STRUCT_SOCKADDR_TEST_CT  2
-tTestDesc aStruct_SockaddrTests[] = {
+static tTestDesc aStruct_SockaddrTests[] = {
   { TT_NEGREP,   zStruct_SockaddrBypass0, (regex_t*)NULL },
   { TT_EGREP,    zStruct_SockaddrSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Struct_Sockaddr
  */
-const char* apzStruct_SockaddrPatch[] = {
+static const char* apzStruct_SockaddrPatch[] = {
     "format",
     "struct sockaddr;\n\
 %0",
@@ -3759,13 +3759,13 @@ tSCC zSun_Auth_ProtoSelect0[] =
        "\\(\\*[a-z][a-z_]*\\)\\(\\)";
 
 #define    SUN_AUTH_PROTO_TEST_CT  1
-tTestDesc aSun_Auth_ProtoTests[] = {
+static tTestDesc aSun_Auth_ProtoTests[] = {
   { TT_EGREP,    zSun_Auth_ProtoSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Sun_Auth_Proto
  */
-const char* apzSun_Auth_ProtoPatch[] = {
+static const char* apzSun_Auth_ProtoPatch[] = {
     "format",
     "#ifdef __cplusplus\n\
 %1(...);%2\n\
@@ -3800,13 +3800,13 @@ tSCC zSun_Bogus_IfdefSelect0[] =
        "#ifdef(.*\\|\\|.*)";
 
 #define    SUN_BOGUS_IFDEF_TEST_CT  1
-tTestDesc aSun_Bogus_IfdefTests[] = {
+static tTestDesc aSun_Bogus_IfdefTests[] = {
   { TT_EGREP,    zSun_Bogus_IfdefSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Sun_Bogus_Ifdef
  */
-const char* apzSun_Bogus_IfdefPatch[] = {
+static const char* apzSun_Bogus_IfdefPatch[] = {
     "format",
     "#if%1",
     (char*)NULL };
@@ -3836,13 +3836,13 @@ tSCC zSun_CatmacroSelect0[] =
        "^#define[ \t]+CAT\\(a,b\\).*";
 
 #define    SUN_CATMACRO_TEST_CT  1
-tTestDesc aSun_CatmacroTests[] = {
+static tTestDesc aSun_CatmacroTests[] = {
   { TT_EGREP,    zSun_CatmacroSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Sun_Catmacro
  */
-const char* apzSun_CatmacroPatch[] = {
+static const char* apzSun_CatmacroPatch[] = {
     "format",
     "#ifdef __STDC__\n\
 #  define CAT(a,b) a##b\n\
@@ -3874,7 +3874,7 @@ tSCC zSun_MallocList[] =
 /*
  *  Fix Command Arguments for Sun_Malloc
  */
-const char* apzSun_MallocPatch[] = { "sed",
+static const char* apzSun_MallocPatch[] = { "sed",
     "-e", "s/typedef[ \t]char \\*\tmalloc_t/typedef void \\*\tmalloc_t/g",
     "-e", "s/int[ \t][ \t]*free/void\tfree/g",
     "-e", "s/char\\([ \t]*\\*[ \t]*malloc\\)/void\\1/g",
@@ -3907,13 +3907,13 @@ tSCC zSun_Rusers_SemiSelect0[] =
        "_cnt$";
 
 #define    SUN_RUSERS_SEMI_TEST_CT  1
-tTestDesc aSun_Rusers_SemiTests[] = {
+static tTestDesc aSun_Rusers_SemiTests[] = {
   { TT_EGREP,    zSun_Rusers_SemiSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Sun_Rusers_Semi
  */
-const char* apzSun_Rusers_SemiPatch[] = { "sed",
+static const char* apzSun_Rusers_SemiPatch[] = { "sed",
     "-e", "/^struct/,/^};/s/_cnt$/_cnt;/",
     (char*)NULL };
 
@@ -3942,13 +3942,13 @@ tSCC zSun_SignalSelect0[] =
        "^void\t\\(\\*signal\\(\\)\\)\\(\\);.*";
 
 #define    SUN_SIGNAL_TEST_CT  1
-tTestDesc aSun_SignalTests[] = {
+static tTestDesc aSun_SignalTests[] = {
   { TT_EGREP,    zSun_SignalSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Sun_Signal
  */
-const char* apzSun_SignalPatch[] = {
+static const char* apzSun_SignalPatch[] = {
     "format",
     "#ifdef __cplusplus\n\
 void\t(*signal(...))(...);\n\
@@ -3988,14 +3988,14 @@ tSCC zSunos_Matherr_DeclBypass0[] =
        "matherr.*struct exception";
 
 #define    SUNOS_MATHERR_DECL_TEST_CT  2
-tTestDesc aSunos_Matherr_DeclTests[] = {
+static tTestDesc aSunos_Matherr_DeclTests[] = {
   { TT_NEGREP,   zSunos_Matherr_DeclBypass0, (regex_t*)NULL },
   { TT_EGREP,    zSunos_Matherr_DeclSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Sunos_Matherr_Decl
  */
-const char* apzSunos_Matherr_DeclPatch[] = {
+static const char* apzSunos_Matherr_DeclPatch[] = {
     "wrap",
     "struct exception;\n",
     (char*)NULL };
@@ -4025,13 +4025,13 @@ tSCC zSunos_StrlenSelect0[] =
        "int[ \t]*strlen\\(\\);(.*)";
 
 #define    SUNOS_STRLEN_TEST_CT  1
-tTestDesc aSunos_StrlenTests[] = {
+static tTestDesc aSunos_StrlenTests[] = {
   { TT_EGREP,    zSunos_StrlenSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Sunos_Strlen
  */
-const char* apzSunos_StrlenPatch[] = {
+static const char* apzSunos_StrlenPatch[] = {
     "format",
     "__SIZE_TYPE__ strlen();%1",
     (char*)NULL };
@@ -4061,13 +4061,13 @@ tSCC zSvr4__PSelect0[] =
        "^#define[ \t]+__P.*";
 
 #define    SVR4__P_TEST_CT  1
-tTestDesc aSvr4__PTests[] = {
+static tTestDesc aSvr4__PTests[] = {
   { TT_EGREP,    zSvr4__PSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Svr4__P
  */
-const char* apzSvr4__PPatch[] = {
+static const char* apzSvr4__PPatch[] = {
     "format",
     "#ifndef __P\n\
 %0\n\
@@ -4099,13 +4099,13 @@ tSCC zSvr4_GetcwdSelect0[] =
        "getcwd\\(char \\*, int\\)";
 
 #define    SVR4_GETCWD_TEST_CT  1
-tTestDesc aSvr4_GetcwdTests[] = {
+static tTestDesc aSvr4_GetcwdTests[] = {
   { TT_EGREP,    zSvr4_GetcwdSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Svr4_Getcwd
  */
-const char* apzSvr4_GetcwdPatch[] = {
+static const char* apzSvr4_GetcwdPatch[] = {
     "format",
     "getcwd(char *, size_t)",
     (char*)NULL };
@@ -4135,13 +4135,13 @@ tSCC zSvr4_ProfilSelect0[] =
        "profil\\(unsigned short \\*, unsigned int, unsigned int, unsigned int\\)";
 
 #define    SVR4_PROFIL_TEST_CT  1
-tTestDesc aSvr4_ProfilTests[] = {
+static tTestDesc aSvr4_ProfilTests[] = {
   { TT_EGREP,    zSvr4_ProfilSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Svr4_Profil
  */
-const char* apzSvr4_ProfilPatch[] = {
+static const char* apzSvr4_ProfilPatch[] = {
     "format",
     "profil(unsigned short *, size_t, int, unsigned int)",
     (char*)NULL };
@@ -4177,14 +4177,14 @@ tSCC zGnu_TypesBypass0[] =
        "_GCC_(PTRDIFF|SIZE|WCHAR)_T";
 
 #define    GNU_TYPES_TEST_CT  2
-tTestDesc aGnu_TypesTests[] = {
+static tTestDesc aGnu_TypesTests[] = {
   { TT_NEGREP,   zGnu_TypesBypass0, (regex_t*)NULL },
   { TT_EGREP,    zGnu_TypesSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Gnu_Types
  */
-const char* apzGnu_TypesPatch[] = {
+static const char* apzGnu_TypesPatch[] = {
     "gnu_type",
     (char*)NULL };
 
@@ -4211,7 +4211,7 @@ tSCC zSysv68_StringList[] =
 /*
  *  Fix Command Arguments for Sysv68_String
  */
-const char* apzSysv68_StringPatch[] = { "sed",
+static const char* apzSysv68_StringPatch[] = { "sed",
     "-e", "s/extern[ \t]*int[ \t]*strlen();/extern unsigned int strlen();/",
     "-e", "s/extern[ \t]*int[ \t]*ffs[ \t]*(long);/extern int ffs(int);/",
     "-e", "s/strdup(char \\*s1);/strdup(const char *s1);/",
@@ -4250,13 +4250,13 @@ tSCC zSysz_Stdlib_For_SunSelect0[] =
        "char[ \t]*\\*[ \t]*(calloc|malloc|realloc|bsearch)[ \t]*\\(";
 
 #define    SYSZ_STDLIB_FOR_SUN_TEST_CT  1
-tTestDesc aSysz_Stdlib_For_SunTests[] = {
+static tTestDesc aSysz_Stdlib_For_SunTests[] = {
   { TT_EGREP,    zSysz_Stdlib_For_SunSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Sysz_Stdlib_For_Sun
  */
-const char* apzSysz_Stdlib_For_SunPatch[] = {
+static const char* apzSysz_Stdlib_For_SunPatch[] = {
     "format",
     "void *\t%1(",
     (char*)NULL };
@@ -4286,13 +4286,13 @@ tSCC zTinfo_CplusplusSelect0[] =
        "[ \t]_cplusplus";
 
 #define    TINFO_CPLUSPLUS_TEST_CT  1
-tTestDesc aTinfo_CplusplusTests[] = {
+static tTestDesc aTinfo_CplusplusTests[] = {
   { TT_EGREP,    zTinfo_CplusplusSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Tinfo_Cplusplus
  */
-const char* apzTinfo_CplusplusPatch[] = {
+static const char* apzTinfo_CplusplusPatch[] = {
     "format",
     " __cplusplus",
     (char*)NULL };
@@ -4322,13 +4322,13 @@ tSCC zUltrix_Atof_ParamSelect0[] =
        "atof\\([ \t]*char";
 
 #define    ULTRIX_ATOF_PARAM_TEST_CT  1
-tTestDesc aUltrix_Atof_ParamTests[] = {
+static tTestDesc aUltrix_Atof_ParamTests[] = {
   { TT_EGREP,    zUltrix_Atof_ParamSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Ultrix_Atof_Param
  */
-const char* apzUltrix_Atof_ParamPatch[] = {
+static const char* apzUltrix_Atof_ParamPatch[] = {
     "format",
     "atof(const char",
     (char*)NULL };
@@ -4358,13 +4358,13 @@ tSCC zUltrix_ConstSelect0[] =
        "perror\\( char \\*";
 
 #define    ULTRIX_CONST_TEST_CT  1
-tTestDesc aUltrix_ConstTests[] = {
+static tTestDesc aUltrix_ConstTests[] = {
   { TT_EGREP,    zUltrix_ConstSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Ultrix_Const
  */
-const char* apzUltrix_ConstPatch[] = {
+static const char* apzUltrix_ConstPatch[] = {
     "format",
     "%1 const %3 *__",
     "([ \t*](perror|fputs|fwrite|scanf|fscanf)\\(.*)[ \t]+(char|void) \\*__",
@@ -4395,13 +4395,13 @@ tSCC zUltrix_Const2Select0[] =
        "\\*fopen\\( char \\*";
 
 #define    ULTRIX_CONST2_TEST_CT  1
-tTestDesc aUltrix_Const2Tests[] = {
+static tTestDesc aUltrix_Const2Tests[] = {
   { TT_EGREP,    zUltrix_Const2Select0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Ultrix_Const2
  */
-const char* apzUltrix_Const2Patch[] = {
+static const char* apzUltrix_Const2Patch[] = {
     "format",
     "%1( const char *%3, const char *",
     "([ \t*](fopen|sscanf|popen|tempnam))\\([ \t]*char[ \t]*\\*([^,]*),[ \t]*char[ \t]*\\*[ \t]*",
@@ -4432,13 +4432,13 @@ tSCC zUltrix_Fix_FixprotoSelect0[] =
        "ULTRIX";
 
 #define    ULTRIX_FIX_FIXPROTO_TEST_CT  1
-tTestDesc aUltrix_Fix_FixprotoTests[] = {
+static tTestDesc aUltrix_Fix_FixprotoTests[] = {
   { TT_EGREP,    zUltrix_Fix_FixprotoSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Ultrix_Fix_Fixproto
  */
-const char* apzUltrix_Fix_FixprotoPatch[] = {
+static const char* apzUltrix_Fix_FixprotoPatch[] = {
     "format",
     "struct utsname;\n\
 %0",
@@ -4470,13 +4470,13 @@ tSCC zUltrix_IfdefSelect0[] =
        "^#ifdef KERNEL[ \t]+&&";
 
 #define    ULTRIX_IFDEF_TEST_CT  1
-tTestDesc aUltrix_IfdefTests[] = {
+static tTestDesc aUltrix_IfdefTests[] = {
   { TT_EGREP,    zUltrix_IfdefSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Ultrix_Ifdef
  */
-const char* apzUltrix_IfdefPatch[] = {
+static const char* apzUltrix_IfdefPatch[] = {
     "format",
     "#if defined(KERNEL) &&",
     (char*)NULL };
@@ -4506,13 +4506,13 @@ tSCC zUltrix_Math_IfdefSelect0[] =
        "^(#if.*)\\|\\|[ \t]+CC\\$[a-z]+";
 
 #define    ULTRIX_MATH_IFDEF_TEST_CT  1
-tTestDesc aUltrix_Math_IfdefTests[] = {
+static tTestDesc aUltrix_Math_IfdefTests[] = {
   { TT_EGREP,    zUltrix_Math_IfdefSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Ultrix_Math_Ifdef
  */
-const char* apzUltrix_Math_IfdefPatch[] = {
+static const char* apzUltrix_Math_IfdefPatch[] = {
     "format",
     "%1",
     (char*)NULL };
@@ -4542,13 +4542,13 @@ tSCC zUltrix_Nested_IoctlSelect0[] =
        "^/\\* #define SIOCSCREEN";
 
 #define    ULTRIX_NESTED_IOCTL_TEST_CT  1
-tTestDesc aUltrix_Nested_IoctlTests[] = {
+static tTestDesc aUltrix_Nested_IoctlTests[] = {
   { TT_EGREP,    zUltrix_Nested_IoctlSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Ultrix_Nested_Ioctl
  */
-const char* apzUltrix_Nested_IoctlPatch[] = { "sed",
+static const char* apzUltrix_Nested_IoctlPatch[] = { "sed",
     "-e", "/^\\/\\* #define SIOCSCREEN/s@/\\* screend@*//* screend@",
     (char*)NULL };
 
@@ -4577,13 +4577,13 @@ tSCC zUltrix_Nested_SvcSelect0[] =
        "^ \\*[ \t]*int protocol;  */\\*";
 
 #define    ULTRIX_NESTED_SVC_TEST_CT  1
-tTestDesc aUltrix_Nested_SvcTests[] = {
+static tTestDesc aUltrix_Nested_SvcTests[] = {
   { TT_EGREP,    zUltrix_Nested_SvcSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Ultrix_Nested_Svc
  */
-const char* apzUltrix_Nested_SvcPatch[] = { "sed",
+static const char* apzUltrix_Nested_SvcPatch[] = { "sed",
     "-e", "s@^\\( \\*\tint protocol;  \\)/\\*@\\1*/ /*@",
     (char*)NULL };
 
@@ -4612,13 +4612,13 @@ tSCC zUltrix_StatSelect0[] =
        "@\\(#\\)stat\\.h.*6\\.1.*\\(ULTRIX\\)";
 
 #define    ULTRIX_STAT_TEST_CT  1
-tTestDesc aUltrix_StatTests[] = {
+static tTestDesc aUltrix_StatTests[] = {
   { TT_EGREP,    zUltrix_StatSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Ultrix_Stat
  */
-const char* apzUltrix_StatPatch[] = { "sed",
+static const char* apzUltrix_StatPatch[] = { "sed",
     "-e", "/^#define[ \t]S_IFPORT[ \t]*S_IFIFO$/a\\\n\
 \\\n\
 /* macro to test for symbolic link */\\\n\
@@ -4653,13 +4653,13 @@ tSCC zUltrix_StaticSelect0[] =
        "#include \"r[34]_cpu";
 
 #define    ULTRIX_STATIC_TEST_CT  1
-tTestDesc aUltrix_StaticTests[] = {
+static tTestDesc aUltrix_StaticTests[] = {
   { TT_EGREP,    zUltrix_StaticSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Ultrix_Static
  */
-const char* apzUltrix_StaticPatch[] = { "sed",
+static const char* apzUltrix_StaticPatch[] = { "sed",
     "-e", "s/^static struct tlb_pid_state/struct tlb_pid_state/",
     "-e", "s/^#include \"r3_cpu\\.h\"$/#include <machine\\/r3_cpu\\.h>/",
     "-e", "s/^#include \"r4_cpu\\.h\"$/#include <machine\\/r4_cpu\\.h>/",
@@ -4690,13 +4690,13 @@ tSCC zUltrix_StringsSelect0[] =
        "@\\(#\\)strings\\.h.*6\\.1.*\\(ULTRIX\\)";
 
 #define    ULTRIX_STRINGS_TEST_CT  1
-tTestDesc aUltrix_StringsTests[] = {
+static tTestDesc aUltrix_StringsTests[] = {
   { TT_EGREP,    zUltrix_StringsSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Ultrix_Strings
  */
-const char* apzUltrix_StringsPatch[] = {
+static const char* apzUltrix_StringsPatch[] = {
     "wrap",
     (char*)NULL };
 
@@ -4730,14 +4730,14 @@ tSCC zUndefine_NullBypass0[] =
        "#[ \t]*(ifn|un)def[ \t]+NULL($|[ \t\r])";
 
 #define    UNDEFINE_NULL_TEST_CT  2
-tTestDesc aUndefine_NullTests[] = {
+static tTestDesc aUndefine_NullTests[] = {
   { TT_NEGREP,   zUndefine_NullBypass0, (regex_t*)NULL },
   { TT_EGREP,    zUndefine_NullSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Undefine_Null
  */
-const char* apzUndefine_NullPatch[] = {
+static const char* apzUndefine_NullPatch[] = {
     "format",
     "#ifndef NULL%2\n\
 #define NULL%1%2\n\
@@ -4784,14 +4784,14 @@ tSCC zUw7_Byteorder_FixTest0[] =
        "-f $DESTDIR/sys/byteorder.h";
 
 #define    UW7_BYTEORDER_FIX_TEST_CT  2
-tTestDesc aUw7_Byteorder_FixTests[] = {
+static tTestDesc aUw7_Byteorder_FixTests[] = {
   { TT_TEST,     zUw7_Byteorder_FixTest0,   0 /* unused */ },
   { TT_EGREP,    zUw7_Byteorder_FixSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Uw7_Byteorder_Fix
  */
-const char* apzUw7_Byteorder_FixPatch[] = {
+static const char* apzUw7_Byteorder_FixPatch[] = {
     "format",
     "",
     "^extern.*(htons|ntohs).*\\(in_port_t\\).*\n",
@@ -4822,13 +4822,13 @@ tSCC zVa_I960_MacroSelect0[] =
        "__(vsiz|vali|vpad|alignof__)";
 
 #define    VA_I960_MACRO_TEST_CT  1
-tTestDesc aVa_I960_MacroTests[] = {
+static tTestDesc aVa_I960_MacroTests[] = {
   { TT_EGREP,    zVa_I960_MacroSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Va_I960_Macro
  */
-const char* apzVa_I960_MacroPatch[] = {
+static const char* apzVa_I960_MacroPatch[] = {
     "format",
     "__vx%1",
     (char*)NULL };
@@ -4858,13 +4858,13 @@ tSCC zVoid_NullSelect0[] =
        "^#[ \t]*define[ \t]+NULL[ \t]+\\(\\(void[ \t]*\\*\\)0\\)";
 
 #define    VOID_NULL_TEST_CT  1
-tTestDesc aVoid_NullTests[] = {
+static tTestDesc aVoid_NullTests[] = {
   { TT_EGREP,    zVoid_NullSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Void_Null
  */
-const char* apzVoid_NullPatch[] = {
+static const char* apzVoid_NullPatch[] = {
     "format",
     "#define NULL 0",
     (char*)NULL };
@@ -4894,13 +4894,13 @@ tSCC zVxworks_Gcc_ProblemSelect0[] =
        "__GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__";
 
 #define    VXWORKS_GCC_PROBLEM_TEST_CT  1
-tTestDesc aVxworks_Gcc_ProblemTests[] = {
+static tTestDesc aVxworks_Gcc_ProblemTests[] = {
   { TT_EGREP,    zVxworks_Gcc_ProblemSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Vxworks_Gcc_Problem
  */
-const char* apzVxworks_Gcc_ProblemPatch[] = { "sed",
+static const char* apzVxworks_Gcc_ProblemPatch[] = { "sed",
     "-e", "s/#ifdef __GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__/#if 1/",
     "-e", "/[ \t]size_t/i\\\n\
 #ifndef _GCC_SIZE_T\\\n\
@@ -4944,13 +4944,13 @@ tSCC zVxworks_Needs_VxtypesSelect0[] =
        "uint_t([ \t]+_clocks_per_sec)";
 
 #define    VXWORKS_NEEDS_VXTYPES_TEST_CT  1
-tTestDesc aVxworks_Needs_VxtypesTests[] = {
+static tTestDesc aVxworks_Needs_VxtypesTests[] = {
   { TT_EGREP,    zVxworks_Needs_VxtypesSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Vxworks_Needs_Vxtypes
  */
-const char* apzVxworks_Needs_VxtypesPatch[] = {
+static const char* apzVxworks_Needs_VxtypesPatch[] = {
     "format",
     "unsigned int%1",
     (char*)NULL };
@@ -4990,7 +4990,7 @@ tSCC zVxworks_Needs_VxworksTest2[] =
        " -n \"`egrep ULONG $file`\"";
 
 #define    VXWORKS_NEEDS_VXWORKS_TEST_CT  4
-tTestDesc aVxworks_Needs_VxworksTests[] = {
+static tTestDesc aVxworks_Needs_VxworksTests[] = {
   { TT_TEST,     zVxworks_Needs_VxworksTest0,   0 /* unused */ },
   { TT_TEST,     zVxworks_Needs_VxworksTest1,   0 /* unused */ },
   { TT_TEST,     zVxworks_Needs_VxworksTest2,   0 /* unused */ },
@@ -4999,7 +4999,7 @@ tTestDesc aVxworks_Needs_VxworksTests[] = {
 /*
  *  Fix Command Arguments for Vxworks_Needs_Vxworks
  */
-const char* apzVxworks_Needs_VxworksPatch[] = { "sed",
+static const char* apzVxworks_Needs_VxworksPatch[] = { "sed",
     "-e", "/#[ \t]define[ \t][ \t]*__INCstath/a\\\n\
 #include <types/vxTypesOld.h>\n",
     (char*)NULL };
@@ -5035,14 +5035,14 @@ tSCC zVxworks_TimeTest0[] =
        " -r vxWorks.h";
 
 #define    VXWORKS_TIME_TEST_CT  2
-tTestDesc aVxworks_TimeTests[] = {
+static tTestDesc aVxworks_TimeTests[] = {
   { TT_TEST,     zVxworks_TimeTest0,   0 /* unused */ },
   { TT_EGREP,    zVxworks_TimeSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Vxworks_Time
  */
-const char* apzVxworks_TimePatch[] = {
+static const char* apzVxworks_TimePatch[] = {
     "format",
     "#ifndef __gcc_VOIDFUNCPTR_defined\n\
 #ifdef __cplusplus\n\
@@ -5086,14 +5086,14 @@ tSCC zX11_ClassBypass0[] =
        "__cplusplus";
 
 #define    X11_CLASS_TEST_CT  2
-tTestDesc aX11_ClassTests[] = {
+static tTestDesc aX11_ClassTests[] = {
   { TT_NEGREP,   zX11_ClassBypass0, (regex_t*)NULL },
   { TT_EGREP,    zX11_ClassSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for X11_Class
  */
-const char* apzX11_ClassPatch[] = {
+static const char* apzX11_ClassPatch[] = {
     "format",
     "#ifdef __cplusplus\n\
 %1c_class;%2\n\
@@ -5133,14 +5133,14 @@ tSCC zX11_Class_UsageBypass0[] =
        "__cplusplus";
 
 #define    X11_CLASS_USAGE_TEST_CT  2
-tTestDesc aX11_Class_UsageTests[] = {
+static tTestDesc aX11_Class_UsageTests[] = {
   { TT_NEGREP,   zX11_Class_UsageBypass0, (regex_t*)NULL },
   { TT_EGREP,    zX11_Class_UsageSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for X11_Class_Usage
  */
-const char* apzX11_Class_UsagePatch[] = {
+static const char* apzX11_Class_UsagePatch[] = {
     "format",
     " c_class)",
     (char*)NULL };
@@ -5170,13 +5170,13 @@ tSCC zX11_NewBypass0[] =
        "__cplusplus";
 
 #define    X11_NEW_TEST_CT  1
-tTestDesc aX11_NewTests[] = {
+static tTestDesc aX11_NewTests[] = {
   { TT_NEGREP,   zX11_NewBypass0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for X11_New
  */
-const char* apzX11_NewPatch[] = { "sed",
+static const char* apzX11_NewPatch[] = { "sed",
     "-e", "/Widget\told, new;/i\\\n\
 #ifdef __cplusplus\\\n\
 \tWidget\told, c_new;\\\n\
@@ -5211,13 +5211,13 @@ tSCC zX11_SprintfSelect0[] =
        "^extern char \\*\tsprintf\\(\\);$";
 
 #define    X11_SPRINTF_TEST_CT  1
-tTestDesc aX11_SprintfTests[] = {
+static tTestDesc aX11_SprintfTests[] = {
   { TT_EGREP,    zX11_SprintfSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for X11_Sprintf
  */
-const char* apzX11_SprintfPatch[] = {
+static const char* apzX11_SprintfPatch[] = {
     "format",
     "#ifndef __STDC__\n\
 %0\n\

gcc/fixinc/fixlib.h

@@ -79,6 +79,7 @@ typedef int t_success;
 #define NULLPROCESS	((pid_t)0)
 
 #define EXIT_PANIC	99
+#endif /* NOPROCESS */
 
 #ifndef HAVE_T_BOOL_ENUM
 #define HAVE_T_BOOL_ENUM
@@ -93,9 +94,6 @@ typedef int apply_fix_p_t;  /* Apply Fix Predicate Type */
 #define APPLY_FIX 0
 #define SKIP_FIX  1
 
-#define _P_(p)	()
-#endif
-
 #define ENV_TABLE                                    \
   _ENV_( pz_machine,   BOOL_TRUE, "TARGET_MACHINE",  \
          "output from config.guess" )                \
@@ -194,25 +192,31 @@ extern int gnu_type_map_ct;
 /*
  *  Exported procedures
  */
-char * load_file_data _P_(( FILE* fp ));
+char * load_file_data PARAMS(( FILE* fp ));
+
 #ifdef IS_CXX_HEADER_NEEDED
-t_bool is_cxx_header  _P_(( tCC* filename, tCC* filetext ));
+t_bool is_cxx_header  PARAMS(( tCC* filename, tCC* filetext ));
 #endif /* IS_CXX_HEADER_NEEDED */
+
 #ifdef SKIP_QUOTE_NEEDED
-tCC*   skip_quote  _P_(( char  q, char* text ));
+tCC*   skip_quote  PARAMS(( char  q, char* text ));
 #endif
-void   compile_re     _P_(( tCC* pat, regex_t* re, int match,
-			    tCC *e1, tCC *e2 ));
 
-void apply_fix _P_(( tFixDesc* p_fixd, tCC* filname ));
-apply_fix_p_t run_test _P_((tCC* t_name, tCC* f_name, tCC* text ));
+void   compile_re  PARAMS(( tCC* pat, regex_t* re, int match,
+                            tCC *e1, tCC *e2 ));
+
+void   apply_fix   PARAMS(( tFixDesc* p_fixd, tCC* filname ));
+apply_fix_p_t
+       run_test    PARAMS(( tCC* t_name, tCC* f_name, tCC* text ));
 
 #ifdef __MSDOS__
-char* make_raw_shell_str _P_(( char* pz_d, tCC* pz_s, size_t smax ));
+char*  make_raw_shell_str
+                   PARAMS(( char* pz_d, tCC* pz_s, size_t smax ));
 #endif
 
 #ifdef MN_NAME_PAT
-void   mn_get_regexps _P_(( regex_t** label_re, regex_t** name_re,
-			    tCC *who ));
+void   mn_get_regexps
+                   PARAMS(( regex_t** label_re, regex_t** name_re,
+                            tCC *who ));
 #endif
 #endif /* FIXINCLUDES_FIXLIB_H */

gcc/fixinc/fixtests.c

@@ -47,18 +47,20 @@ Boston, MA 02111-1307, USA.  */
 
 #include "fixlib.h"
 
+typedef apply_fix_p_t t_test_proc PARAMS(( tCC* file, tCC* text ));
+
 typedef struct {
-    tCC*  test_name;
-    apply_fix_p_t (*test_proc)();
+    tCC*         test_name;
+    t_test_proc* test_proc;
 } test_entry_t;
 
 #define FIX_TEST_TABLE \
   _FT_( "machine_name",     machine_name_test )
 
-
-#define TEST_FOR_FIX_PROC_HEAD( test ) \
-static apply_fix_p_t test ( fname, text ) \
-    tCC* fname; \
+#define TEST_FOR_FIX_PROC_HEAD( test )          \
+t_test_proc test;  /* avoid warning */          \
+static apply_fix_p_t test ( fname, text )       \
+    tCC* fname;                                 \
     tCC* text;
 
 

gcc/fixinc/server.h

@@ -77,6 +77,7 @@ typedef char *t_pchar;
 #define NULLPROCESS	((pid_t)0)
 
 #define EXIT_PANIC	99
+#endif /* NOPROCESS */
 
 #ifndef HAVE_T_BOOL_ENUM
 #define HAVE_T_BOOL_ENUM
@@ -86,14 +87,10 @@ typedef enum
 } t_bool;
 #endif
 
-#define _P_(p)	()
-#endif
-
-char *run_shell   _P_ (( const char *pzCmd));
-pid_t proc2_fopen _P_ (( t_pf_pair * p_pair, t_pchar * pp_args));
-pid_t proc2_open  _P_ (( t_fd_pair * p_pair, t_pchar * pp_args));
-int chain_open    _P_ (( int in_fd,
-                         t_pchar * pp_args,
-                         pid_t * p_child));
-void close_server _P_ (( void ));
+char *run_shell   PARAMS (( const char *pzCmd));
+pid_t proc2_fopen PARAMS (( t_pf_pair * p_pair, t_pchar * pp_args));
+pid_t proc2_open  PARAMS (( t_fd_pair * p_pair, t_pchar * pp_args));
+int   chain_open  PARAMS (( int in_fd, t_pchar * pp_args,
+                            pid_t * p_child));
+void close_server PARAMS (( void ));
 #endif /* FIXINC_SERVER_H */