*
* DO NOT EDIT THIS FILE (fixincl.x)
*
- * It has been AutoGen-ed Tuesday September 15, 2009 at 06:55:13 AM CEST
+ * It has been AutoGen-ed Sunday June 5, 2011 at 09:04:54 PM CDT
* From the definitions inclhack.def
* and the template file fixincl
*/
-/* DO NOT SVN-MERGE THIS FILE, EITHER Di 15. Sep 06:55:13 CEST 2009
+/* DO NOT SVN-MERGE THIS FILE, EITHER Sun Jun 5 21:04:54 CDT 2011
*
* You must regenerate it. Use the ./genfixes script.
*
* certain ANSI-incompatible system header files which are fixed to work
* correctly with ANSI C and placed in a directory that GNU C will search.
*
- * This file contains 202 fixup descriptions.
+ * This file contains 211 fixup descriptions.
*
* See README for more information.
*
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Aix_Net_If_Arp fix
+ */
+tSCC zAix_Net_If_ArpName[] =
+ "aix_net_if_arp";
+
+/*
+ * File name selection pattern
+ */
+tSCC zAix_Net_If_ArpList[] =
+ "net/if_arp.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzAix_Net_If_ArpMachs[] = {
+ "*-*-aix*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zAix_Net_If_ArpSelect0[] =
+ "^struct fc_softc \\{";
+
+#define AIX_NET_IF_ARP_TEST_CT 1
+static tTestDesc aAix_Net_If_ArpTests[] = {
+ { TT_EGREP, zAix_Net_If_ArpSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Aix_Net_If_Arp
+ */
+static const char* apzAix_Net_If_ArpPatch[] = {
+ "format",
+ "typedef struct _fc_softc {",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Aix_Pthread fix
*/
tSCC zAix_PthreadName[] =
* File name selection pattern
*/
tSCC zAix_Stdint_1List[] =
- "stdint.h\0";
+ "stdint-aix.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
* File name selection pattern
*/
tSCC zAix_Stdint_2List[] =
- "stdint.h\0";
+ "stdint-aix.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
* File name selection pattern
*/
tSCC zAix_Stdint_3List[] =
- "stdint.h\0";
+ "stdint-aix.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
* File name selection pattern
*/
tSCC zAix_Stdint_4List[] =
- "stdint.h\0";
+ "stdint-aix.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
* File name selection pattern
*/
tSCC zAix_Stdint_5List[] =
- "stdint.h\0";
+ "stdint-aix.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
* content selection pattern - do fix if pattern found
*/
tSCC zAlpha_AssertSelect0[] =
- "(#define assert\\(EX\\).*)\\(\\(int\\) \\(EX\\)\\)";
+ "(#[ \t]*define assert\\(EX\\).*)\\(\\(int\\) \\(EX\\)\\)";
#define ALPHA_ASSERT_TEST_CT 1
static tTestDesc aAlpha_AssertTests[] = {
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Alpha_Wchar fix
- */
-tSCC zAlpha_WcharName[] =
- "alpha_wchar";
-
-/*
- * File name selection pattern
- */
-tSCC zAlpha_WcharList[] =
- "wchar.h\0";
-/*
- * Machine/OS name selection pattern
- */
-tSCC* apzAlpha_WcharMachs[] = {
- "alpha*-dec-osf4*",
- (const char*)NULL };
-
-/*
- * content selection pattern - do fix if pattern found
- */
-tSCC zAlpha_WcharSelect0[] =
- "#define wcstok wcstok_r";
-
-#define ALPHA_WCHAR_TEST_CT 1
-static tTestDesc aAlpha_WcharTests[] = {
- { TT_EGREP, zAlpha_WcharSelect0, (regex_t*)NULL }, };
-
-/*
- * Fix Command Arguments for Alpha_Wchar
- */
-static const char* apzAlpha_WcharPatch[] = { sed_cmd_z,
- "-e", "s@#define wcstok wcstok_r@extern wchar_t *wcstok __((wchar_t *, const wchar_t *, wchar_t **)) __asm__(\"wcstok_r\");@",
- "-e", "s@#define wcsftime __wcsftime_isoc@extern size_t wcsftime __((wchar_t *, size_t, const wchar_t *, const struct tm *)) __asm__(\"__wcsftime_isoc\");@",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
* Description of Avoid_Bool_Define fix
*/
tSCC zAvoid_Bool_DefineName[] =
* File name selection pattern
*/
tSCC zDarwin_Stdint_1List[] =
- "stdint.h\0";
+ "stdint-darwin.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
* File name selection pattern
*/
tSCC zDarwin_Stdint_2List[] =
- "stdint.h\0";
+ "stdint-darwin.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
* File name selection pattern
*/
tSCC zDarwin_Stdint_3List[] =
- "stdint.h\0";
+ "stdint-darwin.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
* File name selection pattern
*/
tSCC zDarwin_Stdint_4List[] =
- "stdint.h\0";
+ "stdint-darwin.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
* File name selection pattern
*/
tSCC zDarwin_Stdint_5List[] =
- "stdint.h\0";
+ "stdint-darwin.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
* File name selection pattern
*/
tSCC zDarwin_Stdint_6List[] =
- "stdint.h\0";
+ "stdint-darwin.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
* File name selection pattern
*/
tSCC zDarwin_Stdint_7List[] =
- "stdint.h\0";
+ "stdint-darwin.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Glibc_Strncpy fix
+ */
+tSCC zGlibc_StrncpyName[] =
+ "glibc_strncpy";
+
+/*
+ * File name selection pattern
+ */
+tSCC zGlibc_StrncpyList[] =
+ "bits/string2.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+#define apzGlibc_StrncpyMachs (const char**)NULL
+
+/*
+ * content bypass pattern - skip fix if pattern found
+ */
+tSCC zGlibc_StrncpyBypass0[] =
+ "__builtin_strncpy";
+
+#define GLIBC_STRNCPY_TEST_CT 1
+static tTestDesc aGlibc_StrncpyTests[] = {
+ { TT_NEGREP, zGlibc_StrncpyBypass0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Glibc_Strncpy
+ */
+static const char* apzGlibc_StrncpyPatch[] = {
+ "format",
+ "# define strncpy(dest, src, n) __builtin_strncpy (dest, src, n)",
+ "# define strncpy([^\n\
+]*\\\\\n\
+)*[^\n\
+]*",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Glibc_Tgmath fix
*/
tSCC zGlibc_TgmathName[] =
* content selection pattern - do fix if pattern found
*/
tSCC zHpux_HtonlSelect0[] =
- "#ifndef _XOPEN_SOURCE_EXTENDED\n\
+ "#ifndef _XOPEN_SOURCE_EXTENDED[ \t]*\n\
(/\\*\n\
\\* Macros for number representation conversion\\.\n\
\\*/\n\
* File name selection pattern
*/
tSCC zHpux_C99_IntptrList[] =
- "stdint.h\0";
+ "stdint-hpux11.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
* File name selection pattern
*/
tSCC zHpux_C99_InttypesList[] =
- "inttypes.h\0stdint.h\0";
+ "inttypes.h\0stdint-hpux11.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
* File name selection pattern
*/
tSCC zHpux_C99_Inttypes2List[] =
- "stdint.h\0";
+ "stdint-hpux11.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
* File name selection pattern
*/
tSCC zHpux_Stdint_Least_FastList[] =
- "stdint.h\0";
+ "stdint-hpux11.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
*/
static const char* apzHpux_Stdint_Least_FastPatch[] = {
"format",
- "#ifdef __LP64__\n\
-# define\tUINT_%164_MAX\tULONG_MAX\n\
-#else\n\
-%0\n\
-#endif",
+ "# define\tUINT_%164_MAX\t__UINT64_MAX__",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Irix_Pthread_Init fix
+ */
+tSCC zIrix_Pthread_InitName[] =
+ "irix_pthread_init";
+
+/*
+ * File name selection pattern
+ */
+tSCC zIrix_Pthread_InitList[] =
+ "pthread.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzIrix_Pthread_InitMachs[] = {
+ "mips-sgi-irix6.5",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zIrix_Pthread_InitSelect0[] =
+ "^(#define[ \t]+PTHREAD_.*_INITIALIZER[ \t]+)(\\{ 0 \\})";
+
+#define IRIX_PTHREAD_INIT_TEST_CT 1
+static tTestDesc aIrix_Pthread_InitTests[] = {
+ { TT_EGREP, zIrix_Pthread_InitSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Irix_Pthread_Init
+ */
+static const char* apzIrix_Pthread_InitPatch[] = {
+ "format",
+ "%1{ %2 }",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Irix_Socklen_T fix
*/
tSCC zIrix_Socklen_TName[] =
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Irix_Stdint_C99 fix
+ * Description of Irix_Stdint_C99_Mode fix
*/
-tSCC zIrix_Stdint_C99Name[] =
- "irix_stdint_c99";
+tSCC zIrix_Stdint_C99_ModeName[] =
+ "irix_stdint_c99_mode";
/*
* File name selection pattern
*/
-tSCC zIrix_Stdint_C99List[] =
+tSCC zIrix_Stdint_C99_ModeList[] =
"stdint.h\0";
/*
* Machine/OS name selection pattern
*/
-tSCC* apzIrix_Stdint_C99Machs[] = {
+tSCC* apzIrix_Stdint_C99_ModeMachs[] = {
"mips-sgi-irix6.5",
(const char*)NULL };
/*
* content selection pattern - do fix if pattern found
*/
-tSCC zIrix_Stdint_C99Select0[] =
+tSCC zIrix_Stdint_C99_ModeSelect0[] =
"(#ifndef __c99\n\
)(#error This header file is to be used only for c99 mode compilations)";
-#define IRIX_STDINT_C99_TEST_CT 1
-static tTestDesc aIrix_Stdint_C99Tests[] = {
- { TT_EGREP, zIrix_Stdint_C99Select0, (regex_t*)NULL }, };
+#define IRIX_STDINT_C99_MODE_TEST_CT 1
+static tTestDesc aIrix_Stdint_C99_ModeTests[] = {
+ { TT_EGREP, zIrix_Stdint_C99_ModeSelect0, (regex_t*)NULL }, };
/*
- * Fix Command Arguments for Irix_Stdint_C99
+ * Fix Command Arguments for Irix_Stdint_C99_Mode
*/
-static const char* apzIrix_Stdint_C99Patch[] = {
+static const char* apzIrix_Stdint_C99_ModePatch[] = {
"format",
"#if 0\n\
%2",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Irix_Stdint_C99_Types fix
+ */
+tSCC zIrix_Stdint_C99_TypesName[] =
+ "irix_stdint_c99_types";
+
+/*
+ * File name selection pattern
+ */
+tSCC zIrix_Stdint_C99_TypesList[] =
+ "stdint-irix65.h\0stdint.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzIrix_Stdint_C99_TypesMachs[] = {
+ "mips-sgi-irix6.5",
+ (const char*)NULL };
+#define IRIX_STDINT_C99_TYPES_TEST_CT 0
+#define aIrix_Stdint_C99_TypesTests (tTestDesc*)NULL
+
+/*
+ * Fix Command Arguments for Irix_Stdint_C99_Types
+ */
+static const char* apzIrix_Stdint_C99_TypesPatch[] = { sed_cmd_z,
+ "-e", "s@^#define INT64_MIN.*(-0x7fffffffffffffff - 1)$@#define INT64_MIN (-0x7fffffffffffffffLL - 1)@",
+ "-e", "s@^#define INT64_MAX.*0x7fffffffffffffff$@#define INT64_MAX 0x7fffffffffffffffLL@",
+ "-e", "s@^#define UINT32_MAX.*0xffffffff$@#define UINT32_MAX 0xffffffffU@",
+ "-e", "s@^#define UINT64_MAX.*0xffffffffffffffff$@#define UINT64_MAX 0xffffffffffffffffULL@",
+ "-e", "s@^#define INTPTR_MIN.*INT32_MIN$@#define INTPTR_MIN (-0x7fffffffL - 1)@",
+ "-e", "s@^#define INTPTR_MAX.*INT32_MAX$@#define INTPTR_MAX 0x7fffffffL@",
+ "-e", "s@^#define UINTPTR_MAX.*UINT32_MAX$@#define UINTPTR_MAX 0xffffffffUL@",
+ "-e", "s@^#define INTPTR_MIN.*INT64_MIN@#define INTPTR_MIN (-0x7fffffffffffffffL - 1)@",
+ "-e", "s@^#define INTPTR_MAX.*INT64_MAX$@#define INTPTR_MAX 0x7fffffffffffffffL@",
+ "-e", "s@^#define UINTPTR_MAX.*UINT64_MAX$@#define UINTPTR_MAX 0xffffffffffffffffUL@",
+ "-e", "s@^#define PTRDIFF_MIN.*INT64_MIN$@#define PTRDIFF_MIN (-0x7fffffffffffffffL - 1)@",
+ "-e", "s@^#define PTRDIFF_MAX.*INT64_MAX$@#define PTRDIFF_MAX 0x7fffffffffffffffL@",
+ "-e", "s@^#define SIZE_MAX.*UINT64_MAX$@#define SIZE_MAX 0xffffffffffffffffUL@",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Irix_Stdint_C99_Macros fix
+ */
+tSCC zIrix_Stdint_C99_MacrosName[] =
+ "irix_stdint_c99_macros";
+
+/*
+ * File name selection pattern
+ */
+tSCC zIrix_Stdint_C99_MacrosList[] =
+ "stdint-irix65.h\0stdint.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzIrix_Stdint_C99_MacrosMachs[] = {
+ "mips-sgi-irix6.5",
+ (const char*)NULL };
+#define IRIX_STDINT_C99_MACROS_TEST_CT 0
+#define aIrix_Stdint_C99_MacrosTests (tTestDesc*)NULL
+
+/*
+ * Fix Command Arguments for Irix_Stdint_C99_Macros
+ */
+static const char* apzIrix_Stdint_C99_MacrosPatch[] = { sed_cmd_z,
+ "-e", "s@^#define INT8_C(x).*int.*_t.*$@#define INT8_C(x) (x)@",
+ "-e", "s@^#define INT16_C(x).*int.*_t.*$@#define INT16_C(x) (x)@",
+ "-e", "s@^#define INT32_C(x).*int.*_t.*$@#define INT32_C(x) (x)@",
+ "-e", "s@^#define INT64_C(x).*int.*_t.*$@#define INT64_C(x) (x ## LL)@",
+ "-e", "s@^#define UINT8_C(x).*int.*_t.*$@#define UINT8_C(x) (x)@",
+ "-e", "s@^#define UINT16_C(x).*int.*_t.*$@#define UINT16_C(x) (x)@",
+ "-e", "s@^#define UINT32_C(x).*int.*_t.*$@#define UINT32_C(x) (x ## U)@",
+ "-e", "s@^#define UINT64_C(x).*int.*_t.*$@#define UINT64_C(x) (x ## ULL)@",
+ "-e", "s@^#define INTMAX_C(x).*int.*_t.*$@#define INTMAX_C(x) (x ## LL)@",
+ "-e", "s@^#define UINTMAX_C(x).*int.*_t.*$@#define UINTMAX_C(x) (x ## ULL)@",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Irix_Stdio_Va_List fix
*/
tSCC zIrix_Stdio_Va_ListName[] =
* File name selection pattern
*/
tSCC zNewlib_Stdint_1List[] =
- "stdint.h\0";
+ "stdint-newlib.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
* File name selection pattern
*/
tSCC zNewlib_Stdint_2List[] =
- "stdint.h\0";
+ "stdint-newlib.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Solaris___Restrict fix
+ */
+tSCC zSolaris___RestrictName[] =
+ "solaris___restrict";
+
+/*
+ * File name selection pattern
+ */
+tSCC zSolaris___RestrictList[] =
+ "sys/feature_tests.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzSolaris___RestrictMachs[] = {
+ "*-*-solaris2*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris___RestrictSelect0[] =
+ "#define[ \t]*_RESTRICT_KYWD[ \t]*restrict";
+
+#define SOLARIS___RESTRICT_TEST_CT 1
+static tTestDesc aSolaris___RestrictTests[] = {
+ { TT_EGREP, zSolaris___RestrictSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Solaris___Restrict
+ */
+static const char* apzSolaris___RestrictPatch[] = {
+ "format",
+ "#ifdef __cplusplus\n\
+#define\t_RESTRICT_KYWD\t__restrict\n\
+#else\n\
+%0\n\
+#endif",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Solaris_Complex fix
*/
tSCC zSolaris_ComplexName[] =
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Solaris_Complex_Cxx fix
+ */
+tSCC zSolaris_Complex_CxxName[] =
+ "solaris_complex_cxx";
+
+/*
+ * File name selection pattern
+ */
+tSCC zSolaris_Complex_CxxList[] =
+ "complex.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzSolaris_Complex_CxxMachs[] = {
+ "*-*-solaris2.*",
+ (const char*)NULL };
+#define SOLARIS_COMPLEX_CXX_TEST_CT 0
+#define aSolaris_Complex_CxxTests (tTestDesc*)NULL
+
+/*
+ * Fix Command Arguments for Solaris_Complex_Cxx
+ */
+static const char* apzSolaris_Complex_CxxPatch[] = { sed_cmd_z,
+ "-e", "/#if[ \t]*!defined(__cplusplus)/c\\\n\
+#ifdef\t__cplusplus\\\n\
+extern \"C\" {\\\n\
+#endif",
+ "-e", "/#endif[ \t]*\\/\\* !defined(__cplusplus) \\*\\//c\\\n\
+#ifdef\t__cplusplus\\\n\
+}\\\n\
+#endif",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Solaris_Cond_Init fix
+ */
+tSCC zSolaris_Cond_InitName[] =
+ "solaris_cond_init";
+
+/*
+ * File name selection pattern
+ */
+tSCC zSolaris_Cond_InitList[] =
+ "pthread.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzSolaris_Cond_InitMachs[] = {
+ "*-*-solaris2.8",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_Cond_InitSelect0[] =
+ "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+
+#define SOLARIS_COND_INIT_TEST_CT 1
+static tTestDesc aSolaris_Cond_InitTests[] = {
+ { TT_EGREP, zSolaris_Cond_InitSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Solaris_Cond_Init
+ */
+static const char* apzSolaris_Cond_InitPatch[] = {
+ "format",
+ "%1, 0x4356%2",
+ "^(#define[ \t]+PTHREAD_COND_INITIALIZER[ \t]+\\{.*0)(\\},[ \t]*0\\}.*)$",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Solaris_Math_1 fix
*/
tSCC zSolaris_Math_1Name[] =
* content selection pattern - do fix if pattern found
*/
tSCC zSolaris_Math_8Select0[] =
- "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+ "@\\(#\\)math_c99\\.h[ \t]+1\\.[0-9]+[ \t]+[0-9/]+ SMI";
/*
* content bypass pattern - skip fix if pattern found
/*
* Machine/OS name selection pattern
*/
-#define apzSolaris_Int_ConstMachs (const char**)NULL
+tSCC* apzSolaris_Int_ConstMachs[] = {
+ "*-*-solaris2*",
+ (const char*)NULL };
/*
* content selection pattern - do fix if pattern found
*/
tSCC zSolaris_Int_ConstSelect0[] =
- "@\\(#\\)int_const.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+ "^#define[ \t]+UINT8_C\\(c\\)[ \t]+__CONCAT__.*\n\
+(/*.**/)\n\
+#define[ \t]+UINT16_C\\(c\\)[ \t]+__CONCAT__.*";
#define SOLARIS_INT_CONST_TEST_CT 1
static tTestDesc aSolaris_Int_ConstTests[] = {
"#define\tUINT8_C(c)\t(c)\n\
%1\n\
#define\tUINT16_C(c)\t(c)",
- "^#define[ \t]+UINT8_C\\(c\\)[ \t]+__CONCAT__.*\n\
-(/*.**/)\n\
-#define[ \t]+UINT16_C\\(c\\)[ \t]+__CONCAT__.*",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
/*
* Machine/OS name selection pattern
*/
-#define apzSolaris_Int_Limits_1Machs (const char**)NULL
+tSCC* apzSolaris_Int_Limits_1Machs[] = {
+ "*-*-solaris2*",
+ (const char*)NULL };
/*
* content selection pattern - do fix if pattern found
*/
tSCC zSolaris_Int_Limits_1Select0[] =
- "@\\(#\\)int_limits.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+ "^#define[ \t]+UINT8_MAX[ \t]+\\(255U\\)\n\
+#define[ \t]+UINT16_MAX[ \t]+\\(65535U\\)";
#define SOLARIS_INT_LIMITS_1_TEST_CT 1
static tTestDesc aSolaris_Int_Limits_1Tests[] = {
"format",
"#define\tUINT8_MAX\t(255)\n\
#define\tUINT16_MAX\t(65535)",
- "^#define[ \t]+UINT8_MAX[ \t]+\\(255U\\)\n\
-#define[ \t]+UINT16_MAX[ \t]+\\(65535U\\)",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
/*
* Machine/OS name selection pattern
*/
-#define apzSolaris_Int_Limits_2Machs (const char**)NULL
+tSCC* apzSolaris_Int_Limits_2Machs[] = {
+ "*-*-solaris2*",
+ (const char*)NULL };
/*
* content selection pattern - do fix if pattern found
*/
tSCC zSolaris_Int_Limits_2Select0[] =
- "@\\(#\\)int_limits.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+ "^#define[ \t]+(INT|UINT)_FAST16_(MAX|MIN)[ \t](INT|UINT)16.*";
#define SOLARIS_INT_LIMITS_2_TEST_CT 1
static tTestDesc aSolaris_Int_Limits_2Tests[] = {
static const char* apzSolaris_Int_Limits_2Patch[] = {
"format",
"#define\t%1_FAST16_%2 %132_%2",
- "^#define[ \t]+(INT|UINT)_FAST16_(MAX|MIN)[ \t](INT|UINT)16.*",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Solaris_Int_Limits_3 fix
+ */
+tSCC zSolaris_Int_Limits_3Name[] =
+ "solaris_int_limits_3";
+
+/*
+ * File name selection pattern
+ */
+tSCC zSolaris_Int_Limits_3List[] =
+ "sys/int_limits.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzSolaris_Int_Limits_3Machs[] = {
+ "*-*-solaris2*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_Int_Limits_3Select0[] =
+ "^#define[ \t]+SIZE_MAX[ \t]+4294967295UL";
+
+#define SOLARIS_INT_LIMITS_3_TEST_CT 1
+static tTestDesc aSolaris_Int_Limits_3Tests[] = {
+ { TT_EGREP, zSolaris_Int_Limits_3Select0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Solaris_Int_Limits_3
+ */
+static const char* apzSolaris_Int_Limits_3Patch[] = {
+ "format",
+ "#define\tSIZE_MAX\t4294967295U",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Solaris_Sys_Va_List fix
+ */
+tSCC zSolaris_Sys_Va_ListName[] =
+ "solaris_sys_va_list";
+
+/*
+ * File name selection pattern
+ */
+tSCC zSolaris_Sys_Va_ListList[] =
+ "sys/va_list.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzSolaris_Sys_Va_ListMachs[] = {
+ "*-*-solaris2.[89]",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_Sys_Va_ListSelect0[] =
+ "#if.*__STDC__.*\n\
+typedef void \\*__va_list;\n\
+#else\n\
+typedef char \\*__va_list;\n\
+#endif";
+
+#define SOLARIS_SYS_VA_LIST_TEST_CT 1
+static tTestDesc aSolaris_Sys_Va_ListTests[] = {
+ { TT_EGREP, zSolaris_Sys_Va_ListSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Solaris_Sys_Va_List
+ */
+static const char* apzSolaris_Sys_Va_ListPatch[] = {
+ "format",
+ "#ifdef __GNUC__\n\
+typedef __builtin_va_list __va_list;\n\
+#else\n\
+%0\n\
+#endif",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Statsswtch fix
*/
tSCC zStatsswtchName[] =
*
* List of all fixes
*/
-#define REGEX_COUNT 244
+#define REGEX_COUNT 250
#define MACH_LIST_SIZE_LIMIT 181
-#define FIX_COUNT 202
+#define FIX_COUNT 211
/*
* Enumerate the fixes
AAB_SOLARIS_SYS_VARARGS_H_FIXIDX,
AAB_SUN_MEMCPY_FIXIDX,
AIX_COMPLEX_FIXIDX,
+ AIX_NET_IF_ARP_FIXIDX,
AIX_PTHREAD_FIXIDX,
AIX_STDINT_1_FIXIDX,
AIX_STDINT_2_FIXIDX,
ALPHA_PTHREAD_GCC_FIXIDX,
ALPHA_PTHREAD_INIT_FIXIDX,
ALPHA_SBRK_FIXIDX,
- ALPHA_WCHAR_FIXIDX,
AVOID_BOOL_DEFINE_FIXIDX,
AVOID_BOOL_TYPE_FIXIDX,
AVOID_WCHAR_T_TYPE_FIXIDX,
GLIBC_C99_INLINE_4_FIXIDX,
GLIBC_MUTEX_INIT_FIXIDX,
GLIBC_STDINT_FIXIDX,
+ GLIBC_STRNCPY_FIXIDX,
GLIBC_TGMATH_FIXIDX,
GNU_TYPES_FIXIDX,
HP_INLINE_FIXIDX,
IRIX_ASM_APOSTROPHE_FIXIDX,
IRIX_COMPLEX_FIXIDX,
IRIX_LIMITS_CONST_FIXIDX,
+ IRIX_PTHREAD_INIT_FIXIDX,
IRIX_SOCKLEN_T_FIXIDX,
- IRIX_STDINT_C99_FIXIDX,
+ IRIX_STDINT_C99_MODE_FIXIDX,
+ IRIX_STDINT_C99_TYPES_FIXIDX,
+ IRIX_STDINT_C99_MACROS_FIXIDX,
IRIX_STDIO_VA_LIST_FIXIDX,
IRIX_WCSFTIME_FIXIDX,
KANDR_CONCAT_FIXIDX,
RS6000_DOUBLE_FIXIDX,
RS6000_FCHMOD_FIXIDX,
RS6000_PARAM_FIXIDX,
+ SOLARIS___RESTRICT_FIXIDX,
SOLARIS_COMPLEX_FIXIDX,
+ SOLARIS_COMPLEX_CXX_FIXIDX,
+ SOLARIS_COND_INIT_FIXIDX,
SOLARIS_MATH_1_FIXIDX,
SOLARIS_MATH_2_FIXIDX,
SOLARIS_MATH_3_FIXIDX,
SOLARIS_INT_CONST_FIXIDX,
SOLARIS_INT_LIMITS_1_FIXIDX,
SOLARIS_INT_LIMITS_2_FIXIDX,
+ SOLARIS_INT_LIMITS_3_FIXIDX,
SOLARIS_INT_TYPES_FIXIDX,
SOLARIS_STDIO_TAG_FIXIDX,
+ SOLARIS_SYS_VA_LIST_FIXIDX,
STATSSWTCH_FIXIDX,
STDIO_STDARG_H_FIXIDX,
STDIO_VA_LIST_FIXIDX,
AIX_COMPLEX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aAix_ComplexTests, apzAix_ComplexPatch, 0 },
+ { zAix_Net_If_ArpName, zAix_Net_If_ArpList,
+ apzAix_Net_If_ArpMachs,
+ AIX_NET_IF_ARP_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aAix_Net_If_ArpTests, apzAix_Net_If_ArpPatch, 0 },
+
{ zAix_PthreadName, zAix_PthreadList,
apzAix_PthreadMachs,
AIX_PTHREAD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
ALPHA_SBRK_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aAlpha_SbrkTests, apzAlpha_SbrkPatch, 0 },
- { zAlpha_WcharName, zAlpha_WcharList,
- apzAlpha_WcharMachs,
- ALPHA_WCHAR_TEST_CT, FD_MACH_ONLY,
- aAlpha_WcharTests, apzAlpha_WcharPatch, 0 },
-
{ zAvoid_Bool_DefineName, zAvoid_Bool_DefineList,
apzAvoid_Bool_DefineMachs,
AVOID_BOOL_DEFINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
GLIBC_STDINT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aGlibc_StdintTests, apzGlibc_StdintPatch, 0 },
+ { zGlibc_StrncpyName, zGlibc_StrncpyList,
+ apzGlibc_StrncpyMachs,
+ GLIBC_STRNCPY_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aGlibc_StrncpyTests, apzGlibc_StrncpyPatch, 0 },
+
{ zGlibc_TgmathName, zGlibc_TgmathList,
apzGlibc_TgmathMachs,
GLIBC_TGMATH_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
IRIX_LIMITS_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aIrix_Limits_ConstTests, apzIrix_Limits_ConstPatch, 0 },
+ { zIrix_Pthread_InitName, zIrix_Pthread_InitList,
+ apzIrix_Pthread_InitMachs,
+ IRIX_PTHREAD_INIT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aIrix_Pthread_InitTests, apzIrix_Pthread_InitPatch, 0 },
+
{ zIrix_Socklen_TName, zIrix_Socklen_TList,
apzIrix_Socklen_TMachs,
IRIX_SOCKLEN_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aIrix_Socklen_TTests, apzIrix_Socklen_TPatch, 0 },
- { zIrix_Stdint_C99Name, zIrix_Stdint_C99List,
- apzIrix_Stdint_C99Machs,
- IRIX_STDINT_C99_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
- aIrix_Stdint_C99Tests, apzIrix_Stdint_C99Patch, 0 },
+ { zIrix_Stdint_C99_ModeName, zIrix_Stdint_C99_ModeList,
+ apzIrix_Stdint_C99_ModeMachs,
+ IRIX_STDINT_C99_MODE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aIrix_Stdint_C99_ModeTests, apzIrix_Stdint_C99_ModePatch, 0 },
+
+ { zIrix_Stdint_C99_TypesName, zIrix_Stdint_C99_TypesList,
+ apzIrix_Stdint_C99_TypesMachs,
+ IRIX_STDINT_C99_TYPES_TEST_CT, FD_MACH_ONLY,
+ aIrix_Stdint_C99_TypesTests, apzIrix_Stdint_C99_TypesPatch, 0 },
+
+ { zIrix_Stdint_C99_MacrosName, zIrix_Stdint_C99_MacrosList,
+ apzIrix_Stdint_C99_MacrosMachs,
+ IRIX_STDINT_C99_MACROS_TEST_CT, FD_MACH_ONLY,
+ aIrix_Stdint_C99_MacrosTests, apzIrix_Stdint_C99_MacrosPatch, 0 },
{ zIrix_Stdio_Va_ListName, zIrix_Stdio_Va_ListList,
apzIrix_Stdio_Va_ListMachs,
RS6000_PARAM_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aRs6000_ParamTests, apzRs6000_ParamPatch, 0 },
+ { zSolaris___RestrictName, zSolaris___RestrictList,
+ apzSolaris___RestrictMachs,
+ SOLARIS___RESTRICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aSolaris___RestrictTests, apzSolaris___RestrictPatch, 0 },
+
{ zSolaris_ComplexName, zSolaris_ComplexList,
apzSolaris_ComplexMachs,
SOLARIS_COMPLEX_TEST_CT, FD_MACH_ONLY,
aSolaris_ComplexTests, apzSolaris_ComplexPatch, 0 },
+ { zSolaris_Complex_CxxName, zSolaris_Complex_CxxList,
+ apzSolaris_Complex_CxxMachs,
+ SOLARIS_COMPLEX_CXX_TEST_CT, FD_MACH_ONLY,
+ aSolaris_Complex_CxxTests, apzSolaris_Complex_CxxPatch, 0 },
+
+ { zSolaris_Cond_InitName, zSolaris_Cond_InitList,
+ apzSolaris_Cond_InitMachs,
+ SOLARIS_COND_INIT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aSolaris_Cond_InitTests, apzSolaris_Cond_InitPatch, 0 },
+
{ zSolaris_Math_1Name, zSolaris_Math_1List,
apzSolaris_Math_1Machs,
SOLARIS_MATH_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
SOLARIS_INT_LIMITS_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aSolaris_Int_Limits_2Tests, apzSolaris_Int_Limits_2Patch, 0 },
+ { zSolaris_Int_Limits_3Name, zSolaris_Int_Limits_3List,
+ apzSolaris_Int_Limits_3Machs,
+ SOLARIS_INT_LIMITS_3_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aSolaris_Int_Limits_3Tests, apzSolaris_Int_Limits_3Patch, 0 },
+
{ zSolaris_Int_TypesName, zSolaris_Int_TypesList,
apzSolaris_Int_TypesMachs,
SOLARIS_INT_TYPES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
SOLARIS_STDIO_TAG_TEST_CT, FD_MACH_ONLY,
aSolaris_Stdio_TagTests, apzSolaris_Stdio_TagPatch, 0 },
+ { zSolaris_Sys_Va_ListName, zSolaris_Sys_Va_ListList,
+ apzSolaris_Sys_Va_ListMachs,
+ SOLARIS_SYS_VA_LIST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aSolaris_Sys_Va_ListTests, apzSolaris_Sys_Va_ListPatch, 0 },
+
{ zStatsswtchName, zStatsswtchList,
apzStatsswtchMachs,
STATSSWTCH_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
OSDN Git Service
