diff options
Diffstat (limited to 'fixincludes/fixincl.x')
| -rw-r--r-- | fixincludes/fixincl.x | 145 |
1 files changed, 140 insertions, 5 deletions
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index 3dbb744fec1..31c466796de 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 March 23, 2012 at 02:26:20 PM by AutoGen 5.10 + * It has been AutoGen-ed June 19, 2012 at 09:23:54 AM by AutoGen 5.10 * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Fri Mar 23 14:26:20 EDT 2012 +/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Jun 19 09:23:54 EDT 2012 * * 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 212 fixup descriptions. + * This file contains 215 fixup descriptions. * * See README for more information. * @@ -674,6 +674,123 @@ static const char* apzAix_Once_Init_2Patch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Aix_Mutex_Initializer_1 fix + */ +tSCC zAix_Mutex_Initializer_1Name[] = + "aix_mutex_initializer_1"; + +/* + * File name selection pattern + */ +tSCC zAix_Mutex_Initializer_1List[] = + "pthread.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAix_Mutex_Initializer_1Machs[] = { + "*-*-aix*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAix_Mutex_Initializer_1Select0[] = + "#define[ \t]PTHREAD_MUTEX_INITIALIZER \\\\\n\ +\\{ \\\\\n"; + +#define AIX_MUTEX_INITIALIZER_1_TEST_CT 1 +static tTestDesc aAix_Mutex_Initializer_1Tests[] = { + { TT_EGREP, zAix_Mutex_Initializer_1Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aix_Mutex_Initializer_1 + */ +static const char* apzAix_Mutex_Initializer_1Patch[] = { + "format", + "#define PTHREAD_MUTEX_INITIALIZER \\\n\ +{{ \\\n", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Aix_Cond_Initializer_1 fix + */ +tSCC zAix_Cond_Initializer_1Name[] = + "aix_cond_initializer_1"; + +/* + * File name selection pattern + */ +tSCC zAix_Cond_Initializer_1List[] = + "pthread.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAix_Cond_Initializer_1Machs[] = { + "*-*-aix*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAix_Cond_Initializer_1Select0[] = + "#define[ \t]PTHREAD_COND_INITIALIZER \\\\\n\ +\\{ \\\\\n"; + +#define AIX_COND_INITIALIZER_1_TEST_CT 1 +static tTestDesc aAix_Cond_Initializer_1Tests[] = { + { TT_EGREP, zAix_Cond_Initializer_1Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aix_Cond_Initializer_1 + */ +static const char* apzAix_Cond_Initializer_1Patch[] = { + "format", + "#define PTHREAD_COND_INITIALIZER \\\n\ +{{ \\\n", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Aix_Rwlock_Initializer_1 fix + */ +tSCC zAix_Rwlock_Initializer_1Name[] = + "aix_rwlock_initializer_1"; + +/* + * File name selection pattern + */ +tSCC zAix_Rwlock_Initializer_1List[] = + "pthread.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAix_Rwlock_Initializer_1Machs[] = { + "*-*-aix*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAix_Rwlock_Initializer_1Select0[] = + "#define[ \t]PTHREAD_RWLOCK_INITIALIZER \\\\\n\ +\\{ \\\\\n"; + +#define AIX_RWLOCK_INITIALIZER_1_TEST_CT 1 +static tTestDesc aAix_Rwlock_Initializer_1Tests[] = { + { TT_EGREP, zAix_Rwlock_Initializer_1Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aix_Rwlock_Initializer_1 + */ +static const char* apzAix_Rwlock_Initializer_1Patch[] = { + "format", + "#define PTHREAD_RWLOCK_INITIALIZER \\\n\ +{{ \\\n", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Aix_Pthread fix */ tSCC zAix_PthreadName[] = @@ -8629,9 +8746,9 @@ static const char* apzX11_SprintfPatch[] = { * * List of all fixes */ -#define REGEX_COUNT 255 +#define REGEX_COUNT 258 #define MACH_LIST_SIZE_LIMIT 181 -#define FIX_COUNT 212 +#define FIX_COUNT 215 /* * Enumerate the fixes @@ -8650,6 +8767,9 @@ typedef enum { AIX_NET_IF_ARP_FIXIDX, AIX_ONCE_INIT_1_FIXIDX, AIX_ONCE_INIT_2_FIXIDX, + AIX_MUTEX_INITIALIZER_1_FIXIDX, + AIX_COND_INITIALIZER_1_FIXIDX, + AIX_RWLOCK_INITIALIZER_1_FIXIDX, AIX_PTHREAD_FIXIDX, AIX_STDINT_1_FIXIDX, AIX_STDINT_2_FIXIDX, @@ -8917,6 +9037,21 @@ tFixDesc fixDescList[ FIX_COUNT ] = { AIX_ONCE_INIT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aAix_Once_Init_2Tests, apzAix_Once_Init_2Patch, 0 }, + { zAix_Mutex_Initializer_1Name, zAix_Mutex_Initializer_1List, + apzAix_Mutex_Initializer_1Machs, + AIX_MUTEX_INITIALIZER_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAix_Mutex_Initializer_1Tests, apzAix_Mutex_Initializer_1Patch, 0 }, + + { zAix_Cond_Initializer_1Name, zAix_Cond_Initializer_1List, + apzAix_Cond_Initializer_1Machs, + AIX_COND_INITIALIZER_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAix_Cond_Initializer_1Tests, apzAix_Cond_Initializer_1Patch, 0 }, + + { zAix_Rwlock_Initializer_1Name, zAix_Rwlock_Initializer_1List, + apzAix_Rwlock_Initializer_1Machs, + AIX_RWLOCK_INITIALIZER_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAix_Rwlock_Initializer_1Tests, apzAix_Rwlock_Initializer_1Patch, 0 }, + { zAix_PthreadName, zAix_PthreadList, apzAix_PthreadMachs, AIX_PTHREAD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, |