*
* DO NOT EDIT THIS FILE (fixincl.x)
*
- * It has been AutoGen-ed Friday August 28, 2009 at 10:41:05 AM PDT
+ * It has been AutoGen-ed Friday August 28, 2009 at 10:55:38 AM PDT
* From the definitions inclhack.def
* and the template file fixincl
*/
-/* DO NOT SVN-MERGE THIS FILE, EITHER Fri Aug 28 10:41:05 PDT 2009
+/* DO NOT SVN-MERGE THIS FILE, EITHER Fri Aug 28 10:55:38 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 206 fixup descriptions.
+ * This file contains 204 fixup descriptions.
*
* See README for more information.
*
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Hpux_Stdint_Least fix
+ * Description of Hpux_Stdint_Least_Fast fix
*/
-tSCC zHpux_Stdint_LeastName[] =
- "hpux_stdint_least";
+tSCC zHpux_Stdint_Least_FastName[] =
+ "hpux_stdint_least_fast";
/*
* File name selection pattern
*/
-tSCC zHpux_Stdint_LeastList[] =
+tSCC zHpux_Stdint_Least_FastList[] =
"stdint.h\0";
/*
* Machine/OS name selection pattern
*/
-tSCC* apzHpux_Stdint_LeastMachs[] = {
+tSCC* apzHpux_Stdint_Least_FastMachs[] = {
"*-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";
+tSCC zHpux_Stdint_Least_FastSelect0[] =
+ "^[ \t]*#[ \t]*define[ \t]+UINT_(LEAST|FAST)64_MAX[ \t]+ULLONG_MAX";
-#define HPUX_STDINT_LEAST_TEST_CT 1
-static tTestDesc aHpux_Stdint_LeastTests[] = {
- { TT_EGREP, zHpux_Stdint_LeastSelect0, (regex_t*)NULL }, };
+#define HPUX_STDINT_LEAST_FAST_TEST_CT 1
+static tTestDesc aHpux_Stdint_Least_FastTests[] = {
+ { TT_EGREP, zHpux_Stdint_Least_FastSelect0, (regex_t*)NULL }, };
/*
- * Fix Command Arguments for Hpux_Stdint_Least
+ * Fix Command Arguments for Hpux_Stdint_Least_Fast
*/
-static const char* apzHpux_Stdint_LeastPatch[] = {
+static const char* apzHpux_Stdint_Least_FastPatch[] = {
"format",
"#ifdef __LP64__\n\
-# define\tUINT_LEAST64_MAX\tULONG_MAX\n\
+# define\tUINT_%164_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-hpux1[01].*",
- (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;",
+#endif",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
* content selection pattern - do fix if pattern found
*/
tSCC zHpux_Inttype_Int8_TSelect0[] =
- "^[ \t]*typedef[ \t]*char[ \t]*int8_t.*";
+ "^[ \t]*typedef[ \t]*char[ \t]*int(_least){0,1}8_t.*";
#define HPUX_INTTYPE_INT8_T_TEST_CT 1
static tTestDesc aHpux_Inttype_Int8_TTests[] = {
*/
static const char* apzHpux_Inttype_Int8_TPatch[] = {
"format",
- "typedef signed char int8_t;",
+ "typedef signed char int%18_t;",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* List of all fixes
*/
-#define REGEX_COUNT 249
+#define REGEX_COUNT 247
#define MACH_LIST_SIZE_LIMIT 181
-#define FIX_COUNT 206
+#define FIX_COUNT 204
/*
* Enumerate the fixes
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_STDINT_LEAST_FAST_FIXIDX,
HPUX_INTTYPE_INT8_T_FIXIDX,
HPUX_IMAGINARY_I_FIXIDX,
HUGE_VAL_HEX_FIXIDX,
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_Stdint_Least_FastName, zHpux_Stdint_Least_FastList,
+ apzHpux_Stdint_Least_FastMachs,
+ HPUX_STDINT_LEAST_FAST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aHpux_Stdint_Least_FastTests, apzHpux_Stdint_Least_FastPatch, 0 },
{ zHpux_Inttype_Int8_TName, zHpux_Inttype_Int8_TList,
apzHpux_Inttype_Int8_TMachs,
};
fix = {
- hackname = hpux_stdint_least;
+ hackname = hpux_stdint_least_fast;
mach = "*-hp-hpux11.2*";
files = stdint.h;
- select = "^[ \t]*#[ \t]*define[ \t]*UINT_LEAST64_MAX[ \t]*ULLONG_MAX";
- c_fix = format;
- c_fix_arg = "#ifdef __LP64__\n# define UINT_LEAST64_MAX ULONG_MAX\n#else\n%0\n#endif\n";
- test_text ="# define UINT_LEAST64_MAX ULLONG_MAX\n";
-};
-
-fix = {
- hackname = hpux_stdint_fast;
- mach = "*-hp-hpux11.2*";
- files = stdint.h;
- select = "^[ \t]*#[ \t]*define[ \t]*UINT_FAST64_MAX[ \t]*ULLONG_MAX";
- c_fix = format;
- c_fix_arg = "#ifdef __LP64__\n# define UINT_FAST64_MAX ULONG_MAX\n#else\n%0\n#endif\n";
- test_text ="# define UINT_FAST64_MAX ULLONG_MAX\n";
-};
-
-fix = {
- hackname = hpux_inttype_int_least8_t;
- mach = "*-hp-hpux1[01].*";
- files = sys/_inttypes.h;
- select = "^[ \t]*typedef[ \t]*char[ \t]*int_least8_t.*";
+ select =
+ "^[ \t]*#[ \t]*define[ \t]+UINT_(LEAST|FAST)64_MAX[ \t]+ULLONG_MAX";
c_fix = format;
- c_fix_arg = "typedef signed char int_least8_t;";
- test_text ="typedef char int_least8_t;\n";
+ c-fix-arg = <<- _EOFix_
+ #ifdef __LP64__
+ # define UINT_%164_MAX ULONG_MAX
+ #else
+ %0
+ #endif
+ _EOFix_;
+ test-text = <<- _EOFix_
+ # define UINT_FAST64_MAX ULLONG_MAX
+ # define UINT_LEAST64_MAX ULLONG_MAX
+ _EOFix_;
};
fix = {
hackname = hpux_inttype_int8_t;
mach = "*-hp-hpux1[01].*";
files = sys/_inttypes.h;
- select = "^[ \t]*typedef[ \t]*char[ \t]*int8_t.*";
+ select = "^[ \t]*typedef[ \t]*char[ \t]*int(_least){0,1}8_t.*";
c_fix = format;
- c_fix_arg = "typedef signed char int8_t;";
- test_text ="typedef char int8_t;\n";
+ c_fix_arg = "typedef signed char int%18_t;";
+ test_text = "typedef char int_least8_t;\n"
+ "typedef char int8_t;\n";
};
fix = {
projects / thirdparty / gcc.git / commitdiff
