diff options
Diffstat (limited to 'fixincludes/fixincl.x')
| -rw-r--r-- | fixincludes/fixincl.x | 59 |
1 files changed, 54 insertions, 5 deletions
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index cd1b3c5206b..742897e0be6 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 Tuesday September 26, 2006 at 11:56:29 AM EDT + * It has been AutoGen-ed Wednesday September 27, 2006 at 08:16:42 PM EDT * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT CVS-MERGE THIS FILE, EITHER Tue Sep 26 11:56:29 EDT 2006 +/* DO NOT CVS-MERGE THIS FILE, EITHER Wed Sep 27 20:16:42 EDT 2006 * * 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 198 fixup descriptions. + * This file contains 199 fixup descriptions. * * See README for more information. * @@ -5578,6 +5578,49 @@ static const char* apzSolaris_Once_Init_1Patch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Solaris_Once_Init_2 fix + */ +tSCC zSolaris_Once_Init_2Name[] = + "solaris_once_init_2"; + +/* + * File name selection pattern + */ +tSCC zSolaris_Once_Init_2List[] = + "|pthread.h|"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzSolaris_Once_Init_2Machs[] = { + "*-*-solaris2.[0-9]", + "*-*-solaris2.[0-9][!0-9]*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSolaris_Once_Init_2Select0[] = + "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; + +#define SOLARIS_ONCE_INIT_2_TEST_CT 1 +static tTestDesc aSolaris_Once_Init_2Tests[] = { + { TT_EGREP, zSolaris_Once_Init_2Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Solaris_Once_Init_2 + */ +static const char* apzSolaris_Once_Init_2Patch[] = { + "format", + "#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)\n\ +%0\n\ +#else\n\ +%1{0}, {0}, {0}, {%3}%4\n\ +#endif", + "(^#define[ \t]+PTHREAD_ONCE_INIT[ \t]+\\{\\{)(0, 0, 0, )(PTHREAD_[A-Z_]+)(\\}\\})[ \t]*$", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Solaris_Socket fix */ tSCC zSolaris_SocketName[] = @@ -8057,9 +8100,9 @@ static const char* apzX11_SprintfPatch[] = { * * List of all fixes */ -#define REGEX_COUNT 241 +#define REGEX_COUNT 242 #define MACH_LIST_SIZE_LIMIT 261 -#define FIX_COUNT 198 +#define FIX_COUNT 199 /* * Enumerate the fixes @@ -8200,6 +8243,7 @@ typedef enum { SOLARIS_MUTEX_INIT_2_FIXIDX, SOLARIS_RWLOCK_INIT_1_FIXIDX, SOLARIS_ONCE_INIT_1_FIXIDX, + SOLARIS_ONCE_INIT_2_FIXIDX, SOLARIS_SOCKET_FIXIDX, SOLARIS_STDIO_TAG_FIXIDX, SOLARIS_UNISTD_FIXIDX, @@ -8941,6 +8985,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { SOLARIS_ONCE_INIT_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aSolaris_Once_Init_1Tests, apzSolaris_Once_Init_1Patch, 0 }, + { zSolaris_Once_Init_2Name, zSolaris_Once_Init_2List, + apzSolaris_Once_Init_2Machs, + SOLARIS_ONCE_INIT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris_Once_Init_2Tests, apzSolaris_Once_Init_2Patch, 0 }, + { zSolaris_SocketName, zSolaris_SocketList, apzSolaris_SocketMachs, SOLARIS_SOCKET_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, |