*
* DO NOT EDIT THIS FILE (fixincl.x)
*
- * It has been AutoGen-ed Tuesday January 26, 2010 at 08:17:12 PM MET
+ * It has been AutoGen-ed Tuesday March 30, 2010 at 09:51:20 PM MEST
* From the definitions inclhack.def
* and the template file fixincl
*/
-/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Jan 26 20:17:12 MET 2010
+/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Mar 30 21:51:20 MEST 2010
*
* 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 204 fixup descriptions.
+ * This file contains 206 fixup descriptions.
*
* See README for more information.
*
* 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[] =
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * 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 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 };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* List of all fixes
*/
-#define REGEX_COUNT 244
+#define REGEX_COUNT 246
#define MACH_LIST_SIZE_LIMIT 181
-#define FIX_COUNT 204
+#define FIX_COUNT 206
/*
* Enumerate the fixes
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,
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,
STATSSWTCH_FIXIDX,
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,
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,
OSDN Git Service
