From 2627042d9aeed56f7d03429eb439ab1c528f7016 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Wed, 14 May 2008 16:13:40 +0100 Subject: [PATCH] inclhack.def (AAB_fd_zero_asm_posix_types_h): Bypass on posix_types_64. * inclhack.def (AAB_fd_zero_asm_posix_types_h): Bypass on posix_types_64. * fixincl.x: Regenerate. From-SVN: r135297 --- fixincludes/ChangeLog | 6 ++++++ fixincludes/fixincl.x | 13 ++++++++----- fixincludes/inclhack.def | 1 + 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog index 913e34e5c47..3f7e9918163 100644 --- a/fixincludes/ChangeLog +++ b/fixincludes/ChangeLog @@ -1,3 +1,9 @@ +2008-05-14 Joseph Myers + + * inclhack.def (AAB_fd_zero_asm_posix_types_h): Bypass on + posix_types_64. + * fixincl.x: Regenerate. + 2008-04-25 Kai Tietz * fixincl.c (fix_with_system): Cast pointer difference to long. diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index 4338150135c..4d5c8c038a0 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 Friday March 7, 2008 at 07:37:21 AM CET + * It has been AutoGen-ed Wednesday May 14, 2008 at 03:12:47 PM UTC * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Fr 7. Mär 07:37:22 CET 2008 +/* DO NOT SVN-MERGE THIS FILE, EITHER Wed May 14 15:12:47 UTC 2008 * * You must regenerate it. Use the ./genfixes script. * @@ -272,11 +272,14 @@ tSCC zAab_Fd_Zero_Asm_Posix_Types_HBypass0[] = "} while"; tSCC zAab_Fd_Zero_Asm_Posix_Types_HBypass1[] = "x86_64"; +tSCC zAab_Fd_Zero_Asm_Posix_Types_HBypass2[] = + "posix_types_64"; -#define AAB_FD_ZERO_ASM_POSIX_TYPES_H_TEST_CT 2 +#define AAB_FD_ZERO_ASM_POSIX_TYPES_H_TEST_CT 3 static tTestDesc aAab_Fd_Zero_Asm_Posix_Types_HTests[] = { { TT_NEGREP, zAab_Fd_Zero_Asm_Posix_Types_HBypass0, (regex_t*)NULL }, - { TT_NEGREP, zAab_Fd_Zero_Asm_Posix_Types_HBypass1, (regex_t*)NULL }, }; + { TT_NEGREP, zAab_Fd_Zero_Asm_Posix_Types_HBypass1, (regex_t*)NULL }, + { TT_NEGREP, zAab_Fd_Zero_Asm_Posix_Types_HBypass2, (regex_t*)NULL }, }; /* * Fix Command Arguments for Aab_Fd_Zero_Asm_Posix_Types_H @@ -8664,7 +8667,7 @@ static const char* apzX11_SprintfPatch[] = { * * List of all fixes */ -#define REGEX_COUNT 256 +#define REGEX_COUNT 257 #define MACH_LIST_SIZE_LIMIT 261 #define FIX_COUNT 213 diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def index 04b0c82ed6c..a64566e5e0b 100644 --- a/fixincludes/inclhack.def +++ b/fixincludes/inclhack.def @@ -182,6 +182,7 @@ fix = { mach = 'i[34567]86-*-linux*'; bypass = '} while'; bypass = 'x86_64'; + bypass = 'posix_types_64'; /* * Define _POSIX_TYPES_H_WRAPPER at the end of the wrapper, not -- 2.30.2