diff options
Diffstat (limited to 'fixincludes/fixincl.x')
-rw-r--r-- | fixincludes/fixincl.x | 51 |
1 files changed, 46 insertions, 5 deletions
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index 797d962619b..a4eb90b6205 100644 --- a/fixincludes/fixincl.x +++ b/fixincludes/fixincl.x @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (fixincl.x) * - * It has been AutoGen-ed Saturday August 1, 2009 at 09:16:11 PM EDT + * It has been AutoGen-ed Saturday August 8, 2009 at 08:07:05 PM EDT * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Sat Aug 1 21:16:12 EDT 2009 +/* DO NOT SVN-MERGE THIS FILE, EITHER Sat Aug 8 20:07:05 EDT 2009 * * 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 199 fixup descriptions. + * This file contains 200 fixup descriptions. * * See README for more information. * @@ -485,6 +485,41 @@ static const char* apzAab_Sun_MemcpyPatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Aix_Complex fix + */ +tSCC zAix_ComplexName[] = + "aix_complex"; + +/* + * File name selection pattern + */ +tSCC zAix_ComplexList[] = + "complex.h\0"; +/* + * Machine/OS name selection pattern + */ +#define apzAix_ComplexMachs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAix_ComplexSelect0[] = + "AIX xlc C99"; + +#define AIX_COMPLEX_TEST_CT 1 +static tTestDesc aAix_ComplexTests[] = { + { TT_EGREP, zAix_ComplexSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aix_Complex + */ +static const char* apzAix_ComplexPatch[] = { sed_cmd_z, + "-e", "s/^#define[ \t]_Complex_I[ \t]__I//", + "-e", "s/^#define[ \t]I[ \t]_Complex_I//", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Aix_Pthread fix */ tSCC zAix_PthreadName[] = @@ -8093,9 +8128,9 @@ static const char* apzX11_SprintfPatch[] = { * * List of all fixes */ -#define REGEX_COUNT 242 +#define REGEX_COUNT 243 #define MACH_LIST_SIZE_LIMIT 181 -#define FIX_COUNT 199 +#define FIX_COUNT 200 /* * Enumerate the fixes @@ -8109,6 +8144,7 @@ typedef enum { AAB_FD_ZERO_SELECTBITS_H_FIXIDX, AAB_SOLARIS_SYS_VARARGS_H_FIXIDX, AAB_SUN_MEMCPY_FIXIDX, + AIX_COMPLEX_FIXIDX, AIX_PTHREAD_FIXIDX, AIX_SYSMACHINE_FIXIDX, AIX_SYSWAIT_2_FIXIDX, @@ -8343,6 +8379,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { AAB_SUN_MEMCPY_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT, aAab_Sun_MemcpyTests, apzAab_Sun_MemcpyPatch, 0 }, + { zAix_ComplexName, zAix_ComplexList, + apzAix_ComplexMachs, + AIX_COMPLEX_TEST_CT, FD_MACH_ONLY, + aAix_ComplexTests, apzAix_ComplexPatch, 0 }, + { zAix_PthreadName, zAix_PthreadList, apzAix_PthreadMachs, AIX_PTHREAD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, |