inclhack.def (darwin_macho_dyldh): New.
* fixinc/inclhack.def (darwin_macho_dyldh): New. * fixinc/fixincl.x: Regenerate. From-SVN: r74819
This commit is contained in:
parent
d9b000b18c
commit
3afbff37c4
@ -1,3 +1,8 @@
|
||||
2003-12-18 Geoffrey Keating <geoffk@apple.com>
|
||||
|
||||
* fixinc/inclhack.def (darwin_macho_dyldh): New.
|
||||
* fixinc/fixincl.x: Regenerate.
|
||||
|
||||
2003-12-18 Dara Hazeghi <dhazeghi@yahoo.com>
|
||||
|
||||
* version.c (version_string): Renumber as 3.4.0
|
||||
|
@ -2,11 +2,11 @@
|
||||
*
|
||||
* DO NOT EDIT THIS FILE (fixincl.x)
|
||||
*
|
||||
* It has been AutoGen-ed Wednesday November 19, 2003 at 04:30:46 PM MET
|
||||
* It has been AutoGen-ed Thursday December 18, 2003 at 01:49:23 PM PST
|
||||
* From the definitions inclhack.def
|
||||
* and the template file fixincl
|
||||
*/
|
||||
/* DO NOT CVS-MERGE THIS FILE, EITHER Wed Nov 19 16:30:46 MET 2003
|
||||
/* DO NOT CVS-MERGE THIS FILE, EITHER Thu Dec 18 13:49:23 PST 2003
|
||||
*
|
||||
* 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 162 fixup descriptions.
|
||||
* This file contains 163 fixup descriptions.
|
||||
*
|
||||
* See README for more information.
|
||||
*
|
||||
@ -1529,6 +1529,44 @@ extern \"C\" {\n\
|
||||
#endif\n",
|
||||
(char*)NULL };
|
||||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description of Darwin_Private_Extern fix
|
||||
*/
|
||||
tSCC zDarwin_Private_ExternName[] =
|
||||
"darwin_private_extern";
|
||||
|
||||
/*
|
||||
* File name selection pattern
|
||||
*/
|
||||
tSCC zDarwin_Private_ExternList[] =
|
||||
"|mach-o/dyld.h|";
|
||||
/*
|
||||
* Machine/OS name selection pattern
|
||||
*/
|
||||
tSCC* apzDarwin_Private_ExternMachs[] = {
|
||||
"*-*-darwin*",
|
||||
(const char*)NULL };
|
||||
|
||||
/*
|
||||
* content selection pattern - do fix if pattern found
|
||||
*/
|
||||
tSCC zDarwin_Private_ExternSelect0[] =
|
||||
"__private_extern__ [a-z_]+ _dyld_";
|
||||
|
||||
#define DARWIN_PRIVATE_EXTERN_TEST_CT 1
|
||||
static tTestDesc aDarwin_Private_ExternTests[] = {
|
||||
{ TT_EGREP, zDarwin_Private_ExternSelect0, (regex_t*)NULL }, };
|
||||
|
||||
/*
|
||||
* Fix Command Arguments for Darwin_Private_Extern
|
||||
*/
|
||||
static const char* apzDarwin_Private_ExternPatch[] = {
|
||||
"format",
|
||||
"extern",
|
||||
"__private_extern__",
|
||||
(char*)NULL };
|
||||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description of Dec_Intern_Asm fix
|
||||
@ -6415,9 +6453,9 @@ static const char* apzX11_SprintfPatch[] = {
|
||||
*
|
||||
* List of all fixes
|
||||
*/
|
||||
#define REGEX_COUNT 182
|
||||
#define REGEX_COUNT 183
|
||||
#define MACH_LIST_SIZE_LIMIT 261
|
||||
#define FIX_COUNT 162
|
||||
#define FIX_COUNT 163
|
||||
|
||||
/*
|
||||
* Enumerate the fixes
|
||||
@ -6458,6 +6496,7 @@ typedef enum {
|
||||
CTRL_QUOTES_DEF_FIXIDX,
|
||||
CTRL_QUOTES_USE_FIXIDX,
|
||||
CXX_UNREADY_FIXIDX,
|
||||
DARWIN_PRIVATE_EXTERN_FIXIDX,
|
||||
DEC_INTERN_ASM_FIXIDX,
|
||||
DJGPP_WCHAR_H_FIXIDX,
|
||||
ECD_CURSOR_FIXIDX,
|
||||
@ -6763,6 +6802,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
|
||||
CXX_UNREADY_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
|
||||
aCxx_UnreadyTests, apzCxx_UnreadyPatch, 0 },
|
||||
|
||||
{ zDarwin_Private_ExternName, zDarwin_Private_ExternList,
|
||||
apzDarwin_Private_ExternMachs,
|
||||
DARWIN_PRIVATE_EXTERN_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
|
||||
aDarwin_Private_ExternTests, apzDarwin_Private_ExternPatch, 0 },
|
||||
|
||||
{ zDec_Intern_AsmName, zDec_Intern_AsmList,
|
||||
apzDec_Intern_AsmMachs,
|
||||
DEC_INTERN_ASM_TEST_CT, FD_MACH_ONLY,
|
||||
|
@ -935,6 +935,22 @@ fix = {
|
||||
};
|
||||
|
||||
|
||||
/* __private_extern__ doesn't exist in FSF GCC. Even if it did,
|
||||
why would you ever put it in a system header file? */
|
||||
fix = {
|
||||
hackname = darwin_private_extern;
|
||||
mach = "*-*-darwin*";
|
||||
files = mach-o/dyld.h;
|
||||
select = "__private_extern__ [a-z_]+ _dyld_";
|
||||
c_fix = format;
|
||||
c_fix_arg = "extern";
|
||||
c_fix_arg = "__private_extern__";
|
||||
test_text = "__private_extern__ int _dyld_func_lookup(\n"
|
||||
"const char *dyld_func_name,\n"
|
||||
"unsigned long *address);\n";
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* Fix <c_asm.h> on Digital UNIX V4.0:
|
||||
* It contains a prototype for a DEC C internal asm() function,
|
||||
|
Loading…
Reference in New Issue
Block a user