-/*
- * DO NOT EDIT THIS FILE - it has been generated
+/* -*- buffer-read-only: t -*- vi: set ro:
+ *
+ * DO NOT EDIT THIS FILE (fixincl.x)
+ *
+ * It has been AutoGen-ed Saturday May 3, 2003 at 03:55:13 PM PDT
+ * From the definitions inclhack.def
+ * and the template file fixincl
+ */
+/* DO NOT CVS-MERGE THIS FILE, EITHER Sat May 3 15:55:13 PDT 2003
+ *
+ * You must regenerate it. Use the ./genfixes script.
*
- * Install modified versions of 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 is part of the fixincl program used to install modified versions of
+ * 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 152 fixup descriptions.
*
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Bsd_Stdio_Attrs_Conflict fix
- */
-tSCC zBsd_Stdio_Attrs_ConflictName[] =
- "bsd_stdio_attrs_conflict";
-
-/*
- * File name selection pattern
- */
-tSCC zBsd_Stdio_Attrs_ConflictList[] =
- "|stdio.h|";
-/*
- * Machine/OS name selection pattern
- */
-tSCC* apzBsd_Stdio_Attrs_ConflictMachs[] = {
- "*-*-*bsd*",
- "*-*-*darwin*",
- (const char*)NULL };
-
-/*
- * content selection pattern - do fix if pattern found
- */
-tSCC zBsd_Stdio_Attrs_ConflictSelect0[] =
- "^#define[ \t]*vfscanf[ \t]*__svfscanf[ \t]*$";
-
-#define BSD_STDIO_ATTRS_CONFLICT_TEST_CT 1
-static tTestDesc aBsd_Stdio_Attrs_ConflictTests[] = {
- { TT_EGREP, zBsd_Stdio_Attrs_ConflictSelect0, (regex_t*)NULL }, };
-
-/*
- * Fix Command Arguments for Bsd_Stdio_Attrs_Conflict
- */
-static const char* apzBsd_Stdio_Attrs_ConflictPatch[] = {
- "format",
- "#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\");",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
* Description of Broken_Assert_Stdio fix
*/
tSCC zBroken_Assert_StdioName[] =
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Bsd_Stdio_Attrs_Conflict fix
+ */
+tSCC zBsd_Stdio_Attrs_ConflictName[] =
+ "bsd_stdio_attrs_conflict";
+
+/*
+ * File name selection pattern
+ */
+tSCC zBsd_Stdio_Attrs_ConflictList[] =
+ "|stdio.h|";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzBsd_Stdio_Attrs_ConflictMachs[] = {
+ "*-*-*bsd*",
+ "*-*-*darwin*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zBsd_Stdio_Attrs_ConflictSelect0[] =
+ "^#define[ \t]*vfscanf[ \t]*__svfscanf[ \t]*$";
+
+#define BSD_STDIO_ATTRS_CONFLICT_TEST_CT 1
+static tTestDesc aBsd_Stdio_Attrs_ConflictTests[] = {
+ { TT_EGREP, zBsd_Stdio_Attrs_ConflictSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Bsd_Stdio_Attrs_Conflict
+ */
+static const char* apzBsd_Stdio_Attrs_ConflictPatch[] = {
+ "format",
+ "#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\");",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Ctrl_Quotes_Def fix
*/
tSCC zCtrl_Quotes_DefName[] =
BAD_LVAL_FIXIDX,
BAD_STRUCT_TERM_FIXIDX,
BADQUOTE_FIXIDX,
- BSD_STDIO_ATTRS_CONFLICT_FIXIDX,
BROKEN_ASSERT_STDIO_FIXIDX,
BROKEN_ASSERT_STDLIB_FIXIDX,
BROKEN_CABS_FIXIDX,
+ BSD_STDIO_ATTRS_CONFLICT_FIXIDX,
CTRL_QUOTES_DEF_FIXIDX,
CTRL_QUOTES_USE_FIXIDX,
CXX_UNREADY_FIXIDX,
BADQUOTE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aBadquoteTests, apzBadquotePatch, 0 },
- { zBsd_Stdio_Attrs_ConflictName, zBsd_Stdio_Attrs_ConflictList,
- apzBsd_Stdio_Attrs_ConflictMachs,
- BSD_STDIO_ATTRS_CONFLICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
- aBsd_Stdio_Attrs_ConflictTests, apzBsd_Stdio_Attrs_ConflictPatch, 0 },
-
{ zBroken_Assert_StdioName, zBroken_Assert_StdioList,
apzBroken_Assert_StdioMachs,
BROKEN_ASSERT_STDIO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
BROKEN_CABS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aBroken_CabsTests, apzBroken_CabsPatch, 0 },
+ { zBsd_Stdio_Attrs_ConflictName, zBsd_Stdio_Attrs_ConflictList,
+ apzBsd_Stdio_Attrs_ConflictMachs,
+ BSD_STDIO_ATTRS_CONFLICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aBsd_Stdio_Attrs_ConflictTests, apzBsd_Stdio_Attrs_ConflictPatch, 0 },
+
{ zCtrl_Quotes_DefName, zCtrl_Quotes_DefList,
apzCtrl_Quotes_DefMachs,
CTRL_QUOTES_DEF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
/*
- * 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 = {
/*
+ * 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:
*