diff options
Diffstat (limited to 'fixincludes/fixincl.x')
| -rw-r--r-- | fixincludes/fixincl.x | 86 |
1 files changed, 72 insertions, 14 deletions
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index d796014275e..79af6d10f55 100644 --- a/fixincludes/fixincl.x +++ b/fixincludes/fixincl.x @@ -1,12 +1,12 @@ /* -*- buffer-read-only: t -*- vi: set ro: - * - * DO NOT EDIT THIS FILE (fixincl.x) - * - * It has been AutoGen-ed May 21, 2015 at 02:48:12 AM by AutoGen 5.18.3 - * From the definitions inclhack.def - * and the template file fixincl + * + *DO NOT EDIT THIS FILE (fixincl.x) + * + *It has been AutoGen-ed August 13, 2015 at 05:25:50 PM by AutoGen 5.18.3 + *From the definitions inclhack.def + *and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Thu May 21 02:48:12 UTC 2015 +/* DO NOT SVN-MERGE THIS FILE, EITHER Thu Aug 13 17:25:50 UTC 2015 * * You must regenerate it. Use the ./genfixes script. * @@ -15,7 +15,7 @@ * 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 229 fixup descriptions. + * This file contains 230 fixup descriptions. * * See README for more information. * @@ -1503,6 +1503,50 @@ static const char* apzAix_Stdint_5Patch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Aix_Stdio_Inline fix + */ +tSCC zAix_Stdio_InlineName[] = + "aix_stdio_inline"; + +/* + * File name selection pattern + */ +tSCC zAix_Stdio_InlineList[] = + "stdio.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAix_Stdio_InlineMachs[] = { + "*-*-aix*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAix_Stdio_InlineSelect0[] = + "#ifdef __cplusplus\\\n\ +}\\\n\ +\\\n\ +#ifdef ferror\\\n"; + +#define AIX_STDIO_INLINE_TEST_CT 1 +static tTestDesc aAix_Stdio_InlineTests[] = { + { TT_EGREP, zAix_Stdio_InlineSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aix_Stdio_Inline + */ +static const char* apzAix_Stdio_InlinePatch[] = { + "format", + "#ifdef __cplusplus\n\ +}\n\ +#endif\n\n\ +#if (defined(__cplusplus) && defined(__IBMCPP__))\n\ +#ifdef ferror\n", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Aix_Strtof_Const fix */ tSCC zAix_Strtof_ConstName[] = @@ -1516,7 +1560,9 @@ tSCC zAix_Strtof_ConstList[] = /* * Machine/OS name selection pattern */ -#define apzAix_Strtof_ConstMachs (const char**)NULL +tSCC* apzAix_Strtof_ConstMachs[] = { + "*-*-aix*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found @@ -1551,7 +1597,9 @@ tSCC zAix_SysmachineList[] = /* * Machine/OS name selection pattern */ -#define apzAix_SysmachineMachs (const char**)NULL +tSCC* apzAix_SysmachineMachs[] = { + "*-*-aix*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found @@ -1586,7 +1634,9 @@ tSCC zAix_Syswait_2List[] = /* * Machine/OS name selection pattern */ -#define apzAix_Syswait_2Machs (const char**)NULL +tSCC* apzAix_Syswait_2Machs[] = { + "*-*-aix*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found @@ -1621,7 +1671,9 @@ tSCC zAix_VolatileList[] = /* * Machine/OS name selection pattern */ -#define apzAix_VolatileMachs (const char**)NULL +tSCC* apzAix_VolatileMachs[] = { + "*-*-aix*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found @@ -9396,9 +9448,9 @@ static const char* apzX11_SprintfPatch[] = { * * List of all fixes */ -#define REGEX_COUNT 266 +#define REGEX_COUNT 267 #define MACH_LIST_SIZE_LIMIT 187 -#define FIX_COUNT 229 +#define FIX_COUNT 230 /* * Enumerate the fixes @@ -9435,6 +9487,7 @@ typedef enum { AIX_STDINT_3_FIXIDX, AIX_STDINT_4_FIXIDX, AIX_STDINT_5_FIXIDX, + AIX_STDIO_INLINE_FIXIDX, AIX_STRTOF_CONST_FIXIDX, AIX_SYSMACHINE_FIXIDX, AIX_SYSWAIT_2_FIXIDX, @@ -9791,6 +9844,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { AIX_STDINT_5_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aAix_Stdint_5Tests, apzAix_Stdint_5Patch, 0 }, + { zAix_Stdio_InlineName, zAix_Stdio_InlineList, + apzAix_Stdio_InlineMachs, + AIX_STDIO_INLINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAix_Stdio_InlineTests, apzAix_Stdio_InlinePatch, 0 }, + { zAix_Strtof_ConstName, zAix_Strtof_ConstList, apzAix_Strtof_ConstMachs, AIX_STRTOF_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, |