*
* DO NOT EDIT THIS FILE (fixincl.x)
*
- * It has been AutoGen-ed Tuesday April 28, 2009 at 10:20:23 AM UTC
+ * It has been AutoGen-ed Friday May 15, 2009 at 07:23:47 AM PDT
* From the definitions inclhack.def
* and the template file fixincl
*/
-/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Apr 28 10:20:23 UTC 2009
+/* DO NOT SVN-MERGE THIS FILE, EITHER Fri May 15 07:23:47 PDT 2009
*
* 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 181 fixup descriptions.
+ * This file contains 188 fixup descriptions.
*
* See README for more information.
*
* content bypass pattern - skip fix if pattern found
*/
tSCC zGlibc_TgmathBypass0[] =
- "__floating_type \\\\\n\
+ "__floating_type\\(type\\) \\\\\n\
.*__builtin_classify_type";
#define GLIBC_TGMATH_TEST_CT 2
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Hpux11_Uint32_C fix
- */
-tSCC zHpux11_Uint32_CName[] =
- "hpux11_uint32_c";
-
-/*
- * File name selection pattern
- */
-tSCC zHpux11_Uint32_CList[] =
- "inttypes.h\0";
-/*
- * Machine/OS name selection pattern
- */
-#define apzHpux11_Uint32_CMachs (const char**)NULL
-
-/*
- * content selection pattern - do fix if pattern found
- */
-tSCC zHpux11_Uint32_CSelect0[] =
- "^#define UINT32_C\\(__c\\)[ \t]*__CONCAT__\\(__CONCAT_U__\\(__c\\),l\\)";
-
-#define HPUX11_UINT32_C_TEST_CT 1
-static tTestDesc aHpux11_Uint32_CTests[] = {
- { TT_EGREP, zHpux11_Uint32_CSelect0, (regex_t*)NULL }, };
-
-/*
- * Fix Command Arguments for Hpux11_Uint32_C
- */
-static const char* apzHpux11_Uint32_CPatch[] = {
- "format",
- "#define UINT32_C(__c) __CONCAT__(__c,ul)",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
* Description of Hpux11_Vsnprintf fix
*/
tSCC zHpux11_VsnprintfName[] =
/*
* Machine/OS name selection pattern
*/
-#define apzHpux_Long_DoubleMachs (const char**)NULL
+tSCC* apzHpux_Long_DoubleMachs[] = {
+ "*-*-hpux10*",
+ "*-*-hpux11.[012]*",
+ (const char*)NULL };
/*
* content selection pattern - do fix if pattern found
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Hpux_Long_Double_2 fix
+ */
+tSCC zHpux_Long_Double_2Name[] =
+ "hpux_long_double_2";
+
+/*
+ * File name selection pattern
+ */
+tSCC zHpux_Long_Double_2List[] =
+ "stdlib.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzHpux_Long_Double_2Machs[] = {
+ "hppa*-*-hpux11.3*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zHpux_Long_Double_2Select0[] =
+ "#[ \t]*if[ \t]*!defined\\(__ia64\\) \\|\\| defined\\(_PROTOTYPES\\) \\|\\| defined\\(_LONG_DOUBLE_STRUCT\\)";
+
+#define HPUX_LONG_DOUBLE_2_TEST_CT 1
+static tTestDesc aHpux_Long_Double_2Tests[] = {
+ { TT_EGREP, zHpux_Long_Double_2Select0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Hpux_Long_Double_2
+ */
+static const char* apzHpux_Long_Double_2Patch[] = {
+ "format",
+ "# if !defined(_PROTOTYPES) || defined(_LONG_DOUBLE_STRUCT)",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Hpux_Systime fix
*/
tSCC zHpux_SystimeName[] =
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Hpux_C99_Intptr fix
+ */
+tSCC zHpux_C99_IntptrName[] =
+ "hpux_c99_intptr";
+
+/*
+ * File name selection pattern
+ */
+tSCC zHpux_C99_IntptrList[] =
+ "stdint.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzHpux_C99_IntptrMachs[] = {
+ "*-hp-hpux11.3*",
+ (const char*)NULL };
+#define HPUX_C99_INTPTR_TEST_CT 0
+#define aHpux_C99_IntptrTests (tTestDesc*)NULL
+
+/*
+ * Fix Command Arguments for Hpux_C99_Intptr
+ */
+static const char* apzHpux_C99_IntptrPatch[] = { sed_cmd_z,
+ "-e", "s@^[ \t]*#[ \t]*define[ \t]*PTRDIFF_MAX[ \t]*INT32_MAX[ \t]*$@#define PTRDIFF_MAX (2147483647l)@",
+ "-e", "s@^[ \t]*#[ \t]*define[ \t]*PTRDIFF_MIN[ \t]*INT32_MIN[ \t]*$@#define PTRDIFF_MIN (-PTRDIFF_MAX - 1)@",
+ "-e", "s@^[ \t]*#[ \t]*define[ \t]*INTPTR_MAX[ \t]*INT32_MAX[ \t]*$@#define INTPTR_MAX (2147483647l)@",
+ "-e", "s@^[ \t]*#[ \t]*define[ \t]*INTPTR_MIN[ \t]*INT32_MIN[ \t]*$@#define INTPTR_MIN (-INTPTR_MAX - 1)@",
+ "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINTPTR_MAX[ \t]*UINT32_MAX[ \t]*$@#define UINTPTR_MAX (4294967295ul)@",
+ "-e", "s@^[ \t]*#[ \t]*define[ \t]*SIZE_MAX[ \t]*UINT32_MAX[ \t]*$@#define SIZE_MAX (4294967295ul)@",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Hpux_C99_Inttypes fix
+ */
+tSCC zHpux_C99_InttypesName[] =
+ "hpux_c99_inttypes";
+
+/*
+ * File name selection pattern
+ */
+tSCC zHpux_C99_InttypesList[] =
+ "inttypes.h\0stdint.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzHpux_C99_InttypesMachs[] = {
+ "*-hp-hpux11.[23]*",
+ (const char*)NULL };
+#define HPUX_C99_INTTYPES_TEST_CT 0
+#define aHpux_C99_InttypesTests (tTestDesc*)NULL
+
+/*
+ * Fix Command Arguments for Hpux_C99_Inttypes
+ */
+static const char* apzHpux_C99_InttypesPatch[] = { sed_cmd_z,
+ "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT8_C(__c)[ \t]*__CONCAT_U__(__c)[ \t]*$@#define UINT8_C(__c) (__c)@",
+ "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT16_C(__c)[ \t]*__CONCAT_U__(__c)[ \t]*$@#define UINT16_C(__c) (__c)@",
+ "-e", "s@^[ \t]*#[ \t]*define[ \t]*INT32_C(__c)[ \t]*__CONCAT__(__c,l)[ \t]*$@#define INT32_C(__c) (__c)@",
+ "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT32_C(__c)[ \t].*$@#define UINT32_C(__c) __CONCAT__(__c,u)@",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Hpux_C99_Inttypes2 fix
+ */
+tSCC zHpux_C99_Inttypes2Name[] =
+ "hpux_c99_inttypes2";
+
+/*
+ * File name selection pattern
+ */
+tSCC zHpux_C99_Inttypes2List[] =
+ "stdint.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzHpux_C99_Inttypes2Machs[] = {
+ "*-hp-hpux11.2*",
+ (const char*)NULL };
+#define HPUX_C99_INTTYPES2_TEST_CT 0
+#define aHpux_C99_Inttypes2Tests (tTestDesc*)NULL
+
+/*
+ * Fix Command Arguments for Hpux_C99_Inttypes2
+ */
+static const char* apzHpux_C99_Inttypes2Patch[] = { sed_cmd_z,
+ "-e", "s@^[ \t]*#[ \t]*define[ \t]*INT8_C(__c)[ \t]*((signed char)(__c))[ \t]*$@#define INT8_C(__c) (__c)@",
+ "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT8_C(__c)[ \t]*((unsigned char)(__c))[ \t]*$@#define UINT8_C(__c) (__c)@",
+ "-e", "s@^[ \t]*#[ \t]*define[ \t]*INT16_C(__c)[ \t]*((short)(__c))[ \t]*$@#define INT16_C(__c) (__c)@",
+ "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT16_C(__c)[ \t]*((unsigned short)(__c))[ \t]*$@#define UINT16_C(__c) (__c)@",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Hpux_Stdint_Least fix
+ */
+tSCC zHpux_Stdint_LeastName[] =
+ "hpux_stdint_least";
+
+/*
+ * File name selection pattern
+ */
+tSCC zHpux_Stdint_LeastList[] =
+ "stdint.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzHpux_Stdint_LeastMachs[] = {
+ "*-hp-hpux11.2*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zHpux_Stdint_LeastSelect0[] =
+ "^[ \t]*#[ \t]*define[ \t]*UINT_LEAST64_MAX[ \t]*ULLONG_MAX";
+
+#define HPUX_STDINT_LEAST_TEST_CT 1
+static tTestDesc aHpux_Stdint_LeastTests[] = {
+ { TT_EGREP, zHpux_Stdint_LeastSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Hpux_Stdint_Least
+ */
+static const char* apzHpux_Stdint_LeastPatch[] = {
+ "format",
+ "#ifdef __LP64__\n\
+# define\tUINT_LEAST64_MAX\tULONG_MAX\n\
+#else\n\
+%0\n\
+#endif\n",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Hpux_Stdint_Fast fix
+ */
+tSCC zHpux_Stdint_FastName[] =
+ "hpux_stdint_fast";
+
+/*
+ * File name selection pattern
+ */
+tSCC zHpux_Stdint_FastList[] =
+ "stdint.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzHpux_Stdint_FastMachs[] = {
+ "*-hp-hpux11.2*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zHpux_Stdint_FastSelect0[] =
+ "^[ \t]*#[ \t]*define[ \t]*UINT_FAST64_MAX[ \t]*ULLONG_MAX";
+
+#define HPUX_STDINT_FAST_TEST_CT 1
+static tTestDesc aHpux_Stdint_FastTests[] = {
+ { TT_EGREP, zHpux_Stdint_FastSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Hpux_Stdint_Fast
+ */
+static const char* apzHpux_Stdint_FastPatch[] = {
+ "format",
+ "#ifdef __LP64__\n\
+# define\tUINT_FAST64_MAX\t\tULONG_MAX\n\
+#else\n\
+%0\n\
+#endif\n",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Hpux_Inttype_Int_Least8_T fix
+ */
+tSCC zHpux_Inttype_Int_Least8_TName[] =
+ "hpux_inttype_int_least8_t";
+
+/*
+ * File name selection pattern
+ */
+tSCC zHpux_Inttype_Int_Least8_TList[] =
+ "sys/_inttypes.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzHpux_Inttype_Int_Least8_TMachs[] = {
+ "*-hp-hpux11.*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zHpux_Inttype_Int_Least8_TSelect0[] =
+ "^[ \t]*typedef[ \t]*char[ \t]*int_least8_t.*";
+
+#define HPUX_INTTYPE_INT_LEAST8_T_TEST_CT 1
+static tTestDesc aHpux_Inttype_Int_Least8_TTests[] = {
+ { TT_EGREP, zHpux_Inttype_Int_Least8_TSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Hpux_Inttype_Int_Least8_T
+ */
+static const char* apzHpux_Inttype_Int_Least8_TPatch[] = {
+ "format",
+ "typedef signed char int_least8_t;",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Hpux_Inttype_Int8_T fix
+ */
+tSCC zHpux_Inttype_Int8_TName[] =
+ "hpux_inttype_int8_t";
+
+/*
+ * File name selection pattern
+ */
+tSCC zHpux_Inttype_Int8_TList[] =
+ "sys/_inttypes.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzHpux_Inttype_Int8_TMachs[] = {
+ "*-hp-hpux11.*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zHpux_Inttype_Int8_TSelect0[] =
+ "^[ \t]*typedef[ \t]*char[ \t]*int8_t.*";
+
+#define HPUX_INTTYPE_INT8_T_TEST_CT 1
+static tTestDesc aHpux_Inttype_Int8_TTests[] = {
+ { TT_EGREP, zHpux_Inttype_Int8_TSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Hpux_Inttype_Int8_T
+ */
+static const char* apzHpux_Inttype_Int8_TPatch[] = {
+ "format",
+ "typedef signed char int8_t;",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Huge_Val_Hex fix
*/
tSCC zHuge_Val_HexName[] =
*
* List of all fixes
*/
-#define REGEX_COUNT 226
+#define REGEX_COUNT 230
#define MACH_LIST_SIZE_LIMIT 181
-#define FIX_COUNT 181
+#define FIX_COUNT 188
/*
* Enumerate the fixes
HPUX11_PTHREAD_CONST_FIXIDX,
HPUX11_SIZE_T_FIXIDX,
HPUX11_SNPRINTF_FIXIDX,
- HPUX11_UINT32_C_FIXIDX,
HPUX11_VSNPRINTF_FIXIDX,
HPUX8_BOGUS_INLINES_FIXIDX,
HPUX_CTYPE_MACROS_FIXIDX,
HPUX_HTONL_FIXIDX,
HPUX_LONG_DOUBLE_FIXIDX,
+ HPUX_LONG_DOUBLE_2_FIXIDX,
HPUX_SYSTIME_FIXIDX,
HPUX_SPU_INFO_FIXIDX,
HPUX11_EXTERN_SENDFILE_FIXIDX,
HPUX11_EXTERN_SENDPATH_FIXIDX,
HPUX_EXTERN_ERRNO_FIXIDX,
HPUX_PTHREAD_INITIALIZERS_FIXIDX,
+ HPUX_C99_INTPTR_FIXIDX,
+ HPUX_C99_INTTYPES_FIXIDX,
+ HPUX_C99_INTTYPES2_FIXIDX,
+ HPUX_STDINT_LEAST_FIXIDX,
+ HPUX_STDINT_FAST_FIXIDX,
+ HPUX_INTTYPE_INT_LEAST8_T_FIXIDX,
+ HPUX_INTTYPE_INT8_T_FIXIDX,
HUGE_VAL_HEX_FIXIDX,
HUGE_VALF_HEX_FIXIDX,
HUGE_VALL_HEX_FIXIDX,
HPUX11_SNPRINTF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aHpux11_SnprintfTests, apzHpux11_SnprintfPatch, 0 },
- { zHpux11_Uint32_CName, zHpux11_Uint32_CList,
- apzHpux11_Uint32_CMachs,
- HPUX11_UINT32_C_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
- aHpux11_Uint32_CTests, apzHpux11_Uint32_CPatch, 0 },
-
{ zHpux11_VsnprintfName, zHpux11_VsnprintfList,
apzHpux11_VsnprintfMachs,
HPUX11_VSNPRINTF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
HPUX_LONG_DOUBLE_TEST_CT, FD_MACH_ONLY,
aHpux_Long_DoubleTests, apzHpux_Long_DoublePatch, 0 },
+ { zHpux_Long_Double_2Name, zHpux_Long_Double_2List,
+ apzHpux_Long_Double_2Machs,
+ HPUX_LONG_DOUBLE_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aHpux_Long_Double_2Tests, apzHpux_Long_Double_2Patch, 0 },
+
{ zHpux_SystimeName, zHpux_SystimeList,
apzHpux_SystimeMachs,
HPUX_SYSTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
HPUX_PTHREAD_INITIALIZERS_TEST_CT, FD_MACH_ONLY,
aHpux_Pthread_InitializersTests, apzHpux_Pthread_InitializersPatch, 0 },
+ { zHpux_C99_IntptrName, zHpux_C99_IntptrList,
+ apzHpux_C99_IntptrMachs,
+ HPUX_C99_INTPTR_TEST_CT, FD_MACH_ONLY,
+ aHpux_C99_IntptrTests, apzHpux_C99_IntptrPatch, 0 },
+
+ { zHpux_C99_InttypesName, zHpux_C99_InttypesList,
+ apzHpux_C99_InttypesMachs,
+ HPUX_C99_INTTYPES_TEST_CT, FD_MACH_ONLY,
+ aHpux_C99_InttypesTests, apzHpux_C99_InttypesPatch, 0 },
+
+ { zHpux_C99_Inttypes2Name, zHpux_C99_Inttypes2List,
+ apzHpux_C99_Inttypes2Machs,
+ HPUX_C99_INTTYPES2_TEST_CT, FD_MACH_ONLY,
+ aHpux_C99_Inttypes2Tests, apzHpux_C99_Inttypes2Patch, 0 },
+
+ { zHpux_Stdint_LeastName, zHpux_Stdint_LeastList,
+ apzHpux_Stdint_LeastMachs,
+ HPUX_STDINT_LEAST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aHpux_Stdint_LeastTests, apzHpux_Stdint_LeastPatch, 0 },
+
+ { zHpux_Stdint_FastName, zHpux_Stdint_FastList,
+ apzHpux_Stdint_FastMachs,
+ HPUX_STDINT_FAST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aHpux_Stdint_FastTests, apzHpux_Stdint_FastPatch, 0 },
+
+ { zHpux_Inttype_Int_Least8_TName, zHpux_Inttype_Int_Least8_TList,
+ apzHpux_Inttype_Int_Least8_TMachs,
+ HPUX_INTTYPE_INT_LEAST8_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aHpux_Inttype_Int_Least8_TTests, apzHpux_Inttype_Int_Least8_TPatch, 0 },
+
+ { zHpux_Inttype_Int8_TName, zHpux_Inttype_Int8_TList,
+ apzHpux_Inttype_Int8_TMachs,
+ HPUX_INTTYPE_INT8_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aHpux_Inttype_Int8_TTests, apzHpux_Inttype_Int8_TPatch, 0 },
+
{ zHuge_Val_HexName, zHuge_Val_HexList,
apzHuge_Val_HexMachs,
HUGE_VAL_HEX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
OSDN Git Service
