diff options
| author | Bruce Korb <bkorb@gnu.org> | 2003-05-03 22:48:59 +0000 |
|---|---|---|
| committer | Bruce Korb <korbb@gcc.gnu.org> | 2003-05-03 22:48:59 +0000 |
| commit | 8882ac3a647747b3cd1a7010196b282419568932 (patch) | |
| tree | 464b1366ac622433f00e5ab0e9fc4f84effeabbf /gcc/fixinc/inclhack.def | |
| parent | bd879e9a0064cd7d1363a60cc655613bfb5a8547 (diff) | |
| download | gcc-8882ac3a647747b3cd1a7010196b282419568932.zip gcc-8882ac3a647747b3cd1a7010196b282419568932.tar.gz gcc-8882ac3a647747b3cd1a7010196b282419568932.tar.bz2 | |
force merge conflicts in fixincl.x + placement fix
From-SVN: r66439
Diffstat (limited to 'gcc/fixinc/inclhack.def')
| -rw-r--r-- | gcc/fixinc/inclhack.def | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def index ad389f5..39b33cb 100644 --- a/gcc/fixinc/inclhack.def +++ b/gcc/fixinc/inclhack.def @@ -721,26 +721,6 @@ fix = { /* - * Various systems derived from BSD4.4 contain a macro definition - * for vfscanf that interacts badly with requirements of builtin-attrs.def. - * Known to be fixed in FreeBSD 5 system headers. - */ -fix = { - hackname = bsd_stdio_attrs_conflict; - mach = *-*-*bsd*; - mach = *-*-*darwin*; - files = stdio.h; - select = "^#define[ \t]*vfscanf[ \t]*__svfscanf[ \t]*$"; - c_fix = format; - c_fix_arg = '#define _BSD_STRING(_BSD_X) _BSD_STRINGX(_BSD_X)' "\n" - '#define _BSD_STRINGX(_BSD_X) #_BSD_X' "\n" - 'int vfscanf(FILE *, const char *, __builtin_va_list) ' - '__asm__ (_BSD_STRING(__USER_LABEL_PREFIX__) "__svfscanf");'; - test_text = '#define vfscanf __svfscanf'; -}; - - -/* * check for broken assert.h that needs stdio.h */ fix = { @@ -796,6 +776,26 @@ fix = { /* + * Various systems derived from BSD4.4 contain a macro definition + * for vfscanf that interacts badly with requirements of builtin-attrs.def. + * Known to be fixed in FreeBSD 5 system headers. + */ +fix = { + hackname = bsd_stdio_attrs_conflict; + mach = *-*-*bsd*; + mach = *-*-*darwin*; + files = stdio.h; + select = "^#define[ \t]*vfscanf[ \t]*__svfscanf[ \t]*$"; + c_fix = format; + c_fix_arg = '#define _BSD_STRING(_BSD_X) _BSD_STRINGX(_BSD_X)' "\n" + '#define _BSD_STRINGX(_BSD_X) #_BSD_X' "\n" + 'int vfscanf(FILE *, const char *, __builtin_va_list) ' + '__asm__ (_BSD_STRING(__USER_LABEL_PREFIX__) "__svfscanf");'; + test_text = '#define vfscanf __svfscanf'; +}; + + +/* * Fix various macros used to define ioctl numbers. * The traditional syntax was: * |