*
* DO NOT EDIT THIS FILE (fixincl.x)
*
- * It has been AutoGen-ed Saturday November 13, 2004 at 08:30:08 PM UTC
+ * It has been AutoGen-ed Saturday May 7, 2005 at 07:01:32 PM UTC
* From the definitions inclhack.def
* and the template file fixincl
*/
-/* DO NOT CVS-MERGE THIS FILE, EITHER Sat Nov 13 20:30:09 UTC 2004
+/* DO NOT CVS-MERGE THIS FILE, EITHER Sat May 7 19:01:33 UTC 2005
*
* You must regenerate it. Use the ./genfixes script.
*
* 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 176 fixup descriptions.
+ * This file contains 179 fixup descriptions.
*
* See README for more information.
*
#include_next <gnu/types.h>\n\n\
#if defined(__FD_ZERO) && !defined(__GLIBC__)\n\
#undef __FD_ZERO\n\
-# define __FD_ZERO(fdsetp) \\\\\n\
- do { \\\\\n\
- int __d0, __d1; \\\\\n\
-__asm__ __volatile__(\"cld ; rep ; stosl\" \\\\\n\
- \t: \"=&c\" (__d0), \"=&D\" (__d1) \\\\\n\
- \t: \"a\" (0), \"0\" (__FDSET_LONGS), \\\\\n\
- \"1\" ((__fd_set *) (fdsetp)) :\"memory\"); \\\\\n\
+# define __FD_ZERO(fdsetp) \\\n\
+ do { \\\n\
+ int __d0, __d1; \\\n\
+ __asm__ __volatile__(\"cld ; rep ; stosl\" \\\n\
+ : \"=&c\" (__d0), \"=&D\" (__d1) \\\n\
+ : \"a\" (0), \"0\" (__FDSET_LONGS), \\\n\
+ \"1\" ((__fd_set *) (fdsetp)) :\"memory\"); \\\n\
} while (0)\n\
#endif\n\n\
#define _TYPES_H_WRAPPER\n\
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Alpha_Pthread_Init fix
+ */
+tSCC zAlpha_Pthread_InitName[] =
+ "alpha_pthread_init";
+
+/*
+ * File name selection pattern
+ */
+tSCC zAlpha_Pthread_InitList[] =
+ "|pthread.h|";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzAlpha_Pthread_InitMachs[] = {
+ "alpha*-dec-osf*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zAlpha_Pthread_InitSelect0[] =
+ " \\* @\\(#\\).RCSfile: pthread\\.h,v \\$ .Revision: 1\\.1\\.33\\.21 \\$ \\(DEC\\) .Date: 2000/08/15 15:30:13 \\$";
+
+#define ALPHA_PTHREAD_INIT_TEST_CT 1
+static tTestDesc aAlpha_Pthread_InitTests[] = {
+ { TT_EGREP, zAlpha_Pthread_InitSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Alpha_Pthread_Init
+ */
+static const char* apzAlpha_Pthread_InitPatch[] = { "sed",
+ "-e", "s@MVALID\\(.*\\)A}@MVALID\\1A, 0, 0, 0, 0, 0, 0 }@\n\
+s@MVALID\\(.*\\)_}@MVALID\\1_, 0, 0, 0, 0 }@\n\
+s@CVALID\\(.*\\)A}@CVALID\\1A, 0, 0, 0, 0 }@\n\
+s@CVALID\\(.*\\)_}@CVALID\\1_, 0, 0 }@\n\
+s@WVALID\\(.*\\)A}@WVALID\\1A, 0, 0, 0, 0, 0, 0, 0, 0, 0 }@\n\
+s@WVALID\\(.*\\)_}@WVALID\\1_, 0, 0, 0, 0, 0, 0, 0 }@\n",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Alpha_Sbrk fix
*/
tSCC zAlpha_SbrkName[] =
/*
* Machine/OS name selection pattern
*/
-#define apzGnu_TypesMachs (const char**)NULL
+tSCC* apzGnu_TypesMachs[] = {
+ "*-*-solaris2.1[0-9]*",
+ (const char*)NULL };
/*
* content selection pattern - do fix if pattern found
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Hpux_Htonl fix
+ */
+tSCC zHpux_HtonlName[] =
+ "hpux_htonl";
+
+/*
+ * File name selection pattern
+ */
+tSCC zHpux_HtonlList[] =
+ "|netinet/in.h|";
+/*
+ * Machine/OS name selection pattern
+ */
+#define apzHpux_HtonlMachs (const char**)NULL
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zHpux_HtonlSelect0[] =
+ "#ifndef _XOPEN_SOURCE_EXTENDED\n\
+(/\\*\n\
+ \\* Macros for number representation conversion\\.\n\
+ \\*/\n\
+#ifndef ntohl)";
+
+#define HPUX_HTONL_TEST_CT 1
+static tTestDesc aHpux_HtonlTests[] = {
+ { TT_EGREP, zHpux_HtonlSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Hpux_Htonl
+ */
+static const char* apzHpux_HtonlPatch[] = {
+ "format",
+ "#if 1\n\
+%1",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Hpux_Long_Double fix
*/
tSCC zHpux_Long_DoubleName[] =
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Pthread_Incomplete_Struct_Argument fix
+ */
+tSCC zPthread_Incomplete_Struct_ArgumentName[] =
+ "pthread_incomplete_struct_argument";
+
+/*
+ * File name selection pattern
+ */
+tSCC zPthread_Incomplete_Struct_ArgumentList[] =
+ "|pthread.h|";
+/*
+ * Machine/OS name selection pattern
+ */
+#define apzPthread_Incomplete_Struct_ArgumentMachs (const char**)NULL
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zPthread_Incomplete_Struct_ArgumentSelect0[] =
+ "struct __jmp_buf_tag";
+
+#define PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_TEST_CT 1
+static tTestDesc aPthread_Incomplete_Struct_ArgumentTests[] = {
+ { TT_EGREP, zPthread_Incomplete_Struct_ArgumentSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Pthread_Incomplete_Struct_Argument
+ */
+static const char* apzPthread_Incomplete_Struct_ArgumentPatch[] = {
+ "format",
+ "%1 *%2%3",
+ "^(extern int __sigsetjmp \\(struct __jmp_buf_tag) (__env)\\[1\\](.*)$",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Read_Ret_Type fix
*/
tSCC zRead_Ret_TypeName[] =
tSCC zSolaris_Stdio_TagSelect0[] =
"__cplusplus < 54321L";
-#define SOLARIS_STDIO_TAG_TEST_CT 1
+/*
+ * content bypass pattern - skip fix if pattern found
+ */
+tSCC zSolaris_Stdio_TagBypass0[] =
+ "__GNUC__";
+
+#define SOLARIS_STDIO_TAG_TEST_CT 2
static tTestDesc aSolaris_Stdio_TagTests[] = {
+ { TT_NEGREP, zSolaris_Stdio_TagBypass0, (regex_t*)NULL },
{ TT_EGREP, zSolaris_Stdio_TagSelect0, (regex_t*)NULL }, };
/*
/*
* Machine/OS name selection pattern
*/
-#define apzStdio_Stdarg_HMachs (const char**)NULL
+tSCC* apzStdio_Stdarg_HMachs[] = {
+ "*-*-solaris2.1[0-9]*",
+ (const char*)NULL };
/*
* content bypass pattern - skip fix if pattern found
/*
* Machine/OS name selection pattern
*/
-#define apzStdio_Va_ListMachs (const char**)NULL
+tSCC* apzStdio_Va_ListMachs[] = {
+ "*-*-solaris2.1[0-9]*",
+ (const char*)NULL };
/*
* content bypass pattern - skip fix if pattern found
*
* List of all fixes
*/
-#define REGEX_COUNT 205
+#define REGEX_COUNT 209
#define MACH_LIST_SIZE_LIMIT 261
-#define FIX_COUNT 176
+#define FIX_COUNT 179
/*
* Enumerate the fixes
ALPHA_PARENS_FIXIDX,
ALPHA_PTHREAD_FIXIDX,
ALPHA_PTHREAD_GCC_FIXIDX,
+ ALPHA_PTHREAD_INIT_FIXIDX,
ALPHA_SBRK_FIXIDX,
ALPHA_WCHAR_FIXIDX,
AVOID_BOOL_DEFINE_FIXIDX,
HPUX11_VSNPRINTF_FIXIDX,
HPUX8_BOGUS_INLINES_FIXIDX,
HPUX_CTYPE_MACROS_FIXIDX,
+ HPUX_HTONL_FIXIDX,
HPUX_LONG_DOUBLE_FIXIDX,
HPUX_SYSTIME_FIXIDX,
INT_ABORT_FREE_AND_EXIT_FIXIDX,
OSF_NAMESPACE_A_FIXIDX,
OSF_NAMESPACE_C_FIXIDX,
PTHREAD_PAGE_SIZE_FIXIDX,
+ PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_FIXIDX,
READ_RET_TYPE_FIXIDX,
RPC_XDR_LVALUE_CAST_A_FIXIDX,
RPC_XDR_LVALUE_CAST_B_FIXIDX,
ALPHA_PTHREAD_GCC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aAlpha_Pthread_GccTests, apzAlpha_Pthread_GccPatch, 0 },
+ { zAlpha_Pthread_InitName, zAlpha_Pthread_InitList,
+ apzAlpha_Pthread_InitMachs,
+ ALPHA_PTHREAD_INIT_TEST_CT, FD_MACH_ONLY,
+ aAlpha_Pthread_InitTests, apzAlpha_Pthread_InitPatch, 0 },
+
{ zAlpha_SbrkName, zAlpha_SbrkList,
apzAlpha_SbrkMachs,
ALPHA_SBRK_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
{ zGnu_TypesName, zGnu_TypesList,
apzGnu_TypesMachs,
- GNU_TYPES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ GNU_TYPES_TEST_CT, FD_MACH_IFNOT | FD_SUBROUTINE,
aGnu_TypesTests, apzGnu_TypesPatch, 0 },
{ zHp_InlineName, zHp_InlineList,
HPUX_CTYPE_MACROS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aHpux_Ctype_MacrosTests, apzHpux_Ctype_MacrosPatch, 0 },
+ { zHpux_HtonlName, zHpux_HtonlList,
+ apzHpux_HtonlMachs,
+ HPUX_HTONL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aHpux_HtonlTests, apzHpux_HtonlPatch, 0 },
+
{ zHpux_Long_DoubleName, zHpux_Long_DoubleList,
apzHpux_Long_DoubleMachs,
HPUX_LONG_DOUBLE_TEST_CT, FD_MACH_ONLY,
PTHREAD_PAGE_SIZE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aPthread_Page_SizeTests, apzPthread_Page_SizePatch, 0 },
+ { zPthread_Incomplete_Struct_ArgumentName, zPthread_Incomplete_Struct_ArgumentList,
+ apzPthread_Incomplete_Struct_ArgumentMachs,
+ PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aPthread_Incomplete_Struct_ArgumentTests, apzPthread_Incomplete_Struct_ArgumentPatch, 0 },
+
{ zRead_Ret_TypeName, zRead_Ret_TypeList,
apzRead_Ret_TypeMachs,
READ_RET_TYPE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
{ zStdio_Stdarg_HName, zStdio_Stdarg_HList,
apzStdio_Stdarg_HMachs,
- STDIO_STDARG_H_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ STDIO_STDARG_H_TEST_CT, FD_MACH_IFNOT | FD_SUBROUTINE,
aStdio_Stdarg_HTests, apzStdio_Stdarg_HPatch, 0 },
{ zStdio_Va_ListName, zStdio_Va_ListList,
apzStdio_Va_ListMachs,
- STDIO_VA_LIST_TEST_CT, FD_MACH_ONLY,
+ STDIO_VA_LIST_TEST_CT, FD_MACH_IFNOT,
aStdio_Va_ListTests, apzStdio_Va_ListPatch, 0 },
{ zStdio_Va_List_ClientsName, zStdio_Va_List_ClientsList,
OSDN Git Service
