*
* DO NOT EDIT THIS FILE (fixincl.x)
*
- * It has been AutoGen-ed Saturday July 7, 2007 at 11:23:30 PM EDT
+ * It has been AutoGen-ed Monday February 4, 2008 at 09:22:58 PM GMTST
* From the definitions inclhack.def
* and the template file fixincl
*/
-/* DO NOT SVN-MERGE THIS FILE, EITHER Sat Jul 7 23:23:30 EDT 2007
+/* DO NOT SVN-MERGE THIS FILE, EITHER Mon Feb 4 21:22:58 GMTST 2008
*
* 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 210 fixup descriptions.
+ * This file contains 211 fixup descriptions.
*
* See README for more information.
*
* inclhack copyright (c) 1998, 1999, 2000, 2001
* The Free Software Foundation, Inc.
*
- * inclhack is free software.
+ * inclhack is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
*
- * You may redistribute it and/or modify it under the terms of the
- * GNU General Public License, as published by the Free Software
- * Foundation; either version 2, or (at your option) any later version.
- *
- * inclhack is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * inclhack is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with inclhack. See the file "COPYING". If not,
- * write to: The Free Software Foundation, Inc.,
- * 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/* * * * * * * * * * * * * * * * * * * * * * * * * *
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Darwin_Externc fix
+ */
+tSCC zDarwin_ExterncName[] =
+ "darwin_externc";
+
+/*
+ * File name selection pattern
+ */
+tSCC zDarwin_ExterncList[] =
+ "mach-o/swap.h\0mach/mach_time.h\0mach/mach_traps.h\0mach/message.h\0mach/mig.h\0mach/semaphore.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzDarwin_ExterncMachs[] = {
+ "*-*-darwin*",
+ (const char*)NULL };
+
+/*
+ * content bypass pattern - skip fix if pattern found
+ */
+tSCC zDarwin_ExterncBypass0[] =
+ "extern \"C\"";
+tSCC zDarwin_ExterncBypass1[] =
+ "__BEGIN_DECLS";
+
+#define DARWIN_EXTERNC_TEST_CT 2
+static tTestDesc aDarwin_ExterncTests[] = {
+ { TT_NEGREP, zDarwin_ExterncBypass0, (regex_t*)NULL },
+ { TT_NEGREP, zDarwin_ExterncBypass1, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Darwin_Externc
+ */
+static const char* apzDarwin_ExterncPatch[] = {
+ "wrap",
+ "#ifdef __cplusplus\n\
+extern \"C\" {\n\
+#endif\n",
+ "#ifdef __cplusplus\n\
+}\n\
+#endif\n",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Darwin_Gcc4_Breakage fix
*/
tSCC zDarwin_Gcc4_BreakageName[] =
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Glibc_C99_Inline_1a fix
+ */
+tSCC zGlibc_C99_Inline_1aName[] =
+ "glibc_c99_inline_1a";
+
+/*
+ * File name selection pattern
+ */
+tSCC zGlibc_C99_Inline_1aList[] =
+ "features.h\0*/features.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+#define apzGlibc_C99_Inline_1aMachs (const char**)NULL
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zGlibc_C99_Inline_1aSelect0[] =
+ "(\\) && defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__)\n\
+(#[ \t]*define[ \t]*__USE_EXTERN_INLINES[ \t]*1)";
+
+#define GLIBC_C99_INLINE_1A_TEST_CT 1
+static tTestDesc aGlibc_C99_Inline_1aTests[] = {
+ { TT_EGREP, zGlibc_C99_Inline_1aSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Glibc_C99_Inline_1a
+ */
+static const char* apzGlibc_C99_Inline_1aPatch[] = {
+ "format",
+ "%1 && (defined __extern_inline || defined __GNUC_GNU_INLINE__)\n\
+%2",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Glibc_C99_Inline_2 fix
*/
tSCC zGlibc_C99_Inline_2Name[] =
* content bypass pattern - skip fix if pattern found
*/
tSCC zGlibc_C99_Inline_3Bypass0[] =
- "__STDC_VERSION__";
+ "__extern_inline|__GNU_STDC_INLINE__";
#define GLIBC_C99_INLINE_3_TEST_CT 2
static tTestDesc aGlibc_C99_Inline_3Tests[] = {
* File name selection pattern
*/
tSCC zGlibc_C99_Inline_4List[] =
- "sys/sysmacros.h\0*/sys/sysmacros.h\0";
+ "sys/sysmacros.h\0*/sys/sysmacros.h\0wchar.h\0*/wchar.h\0";
/*
* Machine/OS name selection pattern
*/
* content selection pattern - do fix if pattern found
*/
tSCC zGlibc_C99_Inline_4Select0[] =
- "extern __inline";
+ "(^| )extern __inline";
/*
* content bypass pattern - skip fix if pattern found
*/
tSCC zGlibc_C99_Inline_4Bypass0[] =
- "__STDC_VERSION__";
+ "__extern_inline|__gnu_inline__";
#define GLIBC_C99_INLINE_4_TEST_CT 2
static tTestDesc aGlibc_C99_Inline_4Tests[] = {
*/
static const char* apzGlibc_C99_Inline_4Patch[] = {
"format",
- "\n\
-#ifdef __GNUC_GNU_INLINE__\n\
-extern\n\
-#endif\n",
- "(^| )extern ",
+ "%0 __attribute__ ((__gnu_inline__))",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Hpux11_Pthread_Const fix
+ */
+tSCC zHpux11_Pthread_ConstName[] =
+ "hpux11_pthread_const";
+
+/*
+ * File name selection pattern
+ */
+tSCC zHpux11_Pthread_ConstList[] =
+ "sys/pthread.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzHpux11_Pthread_ConstMachs[] = {
+ "*-hp-hpux11.[0-3]*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zHpux11_Pthread_ConstSelect0[] =
+ "^#define[ \t]*__POINTER_SET[ \t]*\\(\\(void \\*\\) 1LL\\)";
+
+#define HPUX11_PTHREAD_CONST_TEST_CT 1
+static tTestDesc aHpux11_Pthread_ConstTests[] = {
+ { TT_EGREP, zHpux11_Pthread_ConstSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Hpux11_Pthread_Const
+ */
+static const char* apzHpux11_Pthread_ConstPatch[] = {
+ "format",
+ "#define __POINTER_SET\t\t((void *) 1L)",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Hpux_Pthread_Initializers fix
*/
tSCC zHpux_Pthread_InitializersName[] =
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Netbsd_C99_Inline_2 fix
+ */
+tSCC zNetbsd_C99_Inline_2Name[] =
+ "netbsd_c99_inline_2";
+
+/*
+ * File name selection pattern
+ */
+tSCC zNetbsd_C99_Inline_2List[] =
+ "signal.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzNetbsd_C99_Inline_2Machs[] = {
+ "*-*-netbsd*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zNetbsd_C99_Inline_2Select0[] =
+ "#define _SIGINLINE extern __inline";
+
+#define NETBSD_C99_INLINE_2_TEST_CT 1
+static tTestDesc aNetbsd_C99_Inline_2Tests[] = {
+ { TT_EGREP, zNetbsd_C99_Inline_2Select0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Netbsd_C99_Inline_2
+ */
+static const char* apzNetbsd_C99_Inline_2Patch[] = {
+ "format",
+ "#ifdef __GNUC_STDC_INLINE__\n\
+#define _SIGINLINE extern __attribute__((__gnu_inline__)) __inline\n\
+#else\n\
+%0\n\
+#endif",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Netbsd_Extra_Semicolon fix
*/
tSCC zNetbsd_Extra_SemicolonName[] =
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Solaris_Math_5 fix
- */
-tSCC zSolaris_Math_5Name[] =
- "solaris_math_5";
-
-/*
- * File name selection pattern
- */
-tSCC zSolaris_Math_5List[] =
- "iso/math_c99.h\0";
-/*
- * Machine/OS name selection pattern
- */
-#define apzSolaris_Math_5Machs (const char**)NULL
-
-/*
- * content selection pattern - do fix if pattern found
- */
-tSCC zSolaris_Math_5Select0[] =
- "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
-
-/*
- * content bypass pattern - skip fix if pattern found
- */
-tSCC zSolaris_Math_5Bypass0[] =
- "__GNUC__";
-
-#define SOLARIS_MATH_5_TEST_CT 2
-static tTestDesc aSolaris_Math_5Tests[] = {
- { TT_NEGREP, zSolaris_Math_5Bypass0, (regex_t*)NULL },
- { TT_EGREP, zSolaris_Math_5Select0, (regex_t*)NULL }, };
-
-/*
- * Fix Command Arguments for Solaris_Math_5
- */
-static const char* apzSolaris_Math_5Patch[] = {
- "format",
- "#define\tisfinite(x) \\\n\
- __extension__ ({ const __typeof (x) __x_f = (x); \\\n\
-\t\t __builtin_expect(sizeof(__x_f) == sizeof(float) \\\n\
-\t\t\t ? islessequal(__builtin_fabsf(__x_f),__FLT_MAX__) \\\n\
-\t\t\t : sizeof(__x_f) == sizeof(long double) \\\n\
-\t\t\t ? islessequal(__builtin_fabsl(__x_f),__LDBL_MAX__) \\\n\
-\t\t\t : islessequal(__builtin_fabs(__x_f),__DBL_MAX__), 1); })",
- "^#define[ \t]+isfinite\\(x\\)[ \t]+__builtin_isfinite\\(x\\)",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description of Solaris_Math_6 fix
- */
-tSCC zSolaris_Math_6Name[] =
- "solaris_math_6";
-
-/*
- * File name selection pattern
- */
-tSCC zSolaris_Math_6List[] =
- "iso/math_c99.h\0";
-/*
- * Machine/OS name selection pattern
- */
-#define apzSolaris_Math_6Machs (const char**)NULL
-
-/*
- * content selection pattern - do fix if pattern found
- */
-tSCC zSolaris_Math_6Select0[] =
- "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
-
-/*
- * content bypass pattern - skip fix if pattern found
- */
-tSCC zSolaris_Math_6Bypass0[] =
- "__GNUC__";
-
-#define SOLARIS_MATH_6_TEST_CT 2
-static tTestDesc aSolaris_Math_6Tests[] = {
- { TT_NEGREP, zSolaris_Math_6Bypass0, (regex_t*)NULL },
- { TT_EGREP, zSolaris_Math_6Select0, (regex_t*)NULL }, };
-
-/*
- * Fix Command Arguments for Solaris_Math_6
- */
-static const char* apzSolaris_Math_6Patch[] = {
- "format",
- "#define\tisinf(x) \\\n\
- __extension__ ({ const __typeof (x) __x_i = (x); \\\n\
-\t\t __builtin_expect(sizeof(__x_i) == sizeof(float) \\\n\
-\t\t\t ? isgreater(__builtin_fabsf(__x_i),__FLT_MAX__) \\\n\
-\t\t\t : sizeof(__x_i) == sizeof(long double) \\\n\
-\t\t\t ? isgreater(__builtin_fabsl(__x_i),__LDBL_MAX__) \\\n\
-\t\t\t : isgreater(__builtin_fabs(__x_i),__DBL_MAX__), 0); })",
- "^#define[ \t]+isinf\\(x\\)[ \t]+__builtin_isinf\\(x\\)",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description of Solaris_Math_7 fix
- */
-tSCC zSolaris_Math_7Name[] =
- "solaris_math_7";
-
-/*
- * File name selection pattern
- */
-tSCC zSolaris_Math_7List[] =
- "iso/math_c99.h\0";
-/*
- * Machine/OS name selection pattern
- */
-#define apzSolaris_Math_7Machs (const char**)NULL
-
-/*
- * content selection pattern - do fix if pattern found
- */
-tSCC zSolaris_Math_7Select0[] =
- "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
-
-/*
- * content bypass pattern - skip fix if pattern found
- */
-tSCC zSolaris_Math_7Bypass0[] =
- "__GNUC__";
-
-#define SOLARIS_MATH_7_TEST_CT 2
-static tTestDesc aSolaris_Math_7Tests[] = {
- { TT_NEGREP, zSolaris_Math_7Bypass0, (regex_t*)NULL },
- { TT_EGREP, zSolaris_Math_7Select0, (regex_t*)NULL }, };
-
-/*
- * Fix Command Arguments for Solaris_Math_7
- */
-static const char* apzSolaris_Math_7Patch[] = {
- "format",
- "#define\tisnormal(x) \\\n\
- __extension__ ({ const __typeof(x) __x_n = (x); \\\n\
-\t\t __builtin_expect(isfinite(__x_n) \\\n\
-\t\t\t\t && (sizeof(__x_n) == sizeof(float) \\\n\
-\t\t\t\t\t ? isgreaterequal(__builtin_fabsf(__x_n),__FLT_MIN__) \\\n\
-\t\t\t\t\t : sizeof(__x_n) == sizeof(long double) \\\n\
-\t\t\t\t\t ? isgreaterequal(__builtin_fabsl(__x_n),__LDBL_MIN__) \\\n\
-\t\t\t\t\t : isgreaterequal(__builtin_fabs(__x_n),__DBL_MIN__)), 1); })",
- "^#define[ \t]+isnormal\\(x\\)[ \t]+__builtin_isnormal\\(x\\)",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
* Description of Solaris_Math_8 fix
*/
tSCC zSolaris_Math_8Name[] =
*
* List of all fixes
*/
-#define REGEX_COUNT 255
+#define REGEX_COUNT 254
#define MACH_LIST_SIZE_LIMIT 261
-#define FIX_COUNT 210
+#define FIX_COUNT 211
/*
* Enumerate the fixes
CTRL_QUOTES_DEF_FIXIDX,
CTRL_QUOTES_USE_FIXIDX,
CXX_UNREADY_FIXIDX,
+ DARWIN_EXTERNC_FIXIDX,
DARWIN_GCC4_BREAKAGE_FIXIDX,
DARWIN_PRIVATE_EXTERN_FIXIDX,
DEC_INTERN_ASM_FIXIDX,
FREEBSD_GCC3_BREAKAGE_FIXIDX,
FREEBSD_GCC4_BREAKAGE_FIXIDX,
GLIBC_C99_INLINE_1_FIXIDX,
+ GLIBC_C99_INLINE_1A_FIXIDX,
GLIBC_C99_INLINE_2_FIXIDX,
GLIBC_C99_INLINE_3_FIXIDX,
GLIBC_C99_INLINE_4_FIXIDX,
HPUX11_EXTERN_SENDFILE_FIXIDX,
HPUX11_EXTERN_SENDPATH_FIXIDX,
HPUX_EXTERN_ERRNO_FIXIDX,
+ HPUX11_PTHREAD_CONST_FIXIDX,
HPUX_PTHREAD_INITIALIZERS_FIXIDX,
HUGE_VAL_HEX_FIXIDX,
HUGE_VALF_HEX_FIXIDX,
NESTED_MOTOROLA_FIXIDX,
NESTED_SYS_LIMITS_FIXIDX,
NETBSD_C99_INLINE_1_FIXIDX,
+ NETBSD_C99_INLINE_2_FIXIDX,
NETBSD_EXTRA_SEMICOLON_FIXIDX,
NEXT_MATH_PREFIX_FIXIDX,
NEXT_TEMPLATE_FIXIDX,
SOLARIS_MATH_2_FIXIDX,
SOLARIS_MATH_3_FIXIDX,
SOLARIS_MATH_4_FIXIDX,
- SOLARIS_MATH_5_FIXIDX,
- SOLARIS_MATH_6_FIXIDX,
- SOLARIS_MATH_7_FIXIDX,
SOLARIS_MATH_8_FIXIDX,
SOLARIS_MATH_9_FIXIDX,
SOLARIS_MUTEX_INIT_1_FIXIDX,
CXX_UNREADY_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aCxx_UnreadyTests, apzCxx_UnreadyPatch, 0 },
+ { zDarwin_ExterncName, zDarwin_ExterncList,
+ apzDarwin_ExterncMachs,
+ DARWIN_EXTERNC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aDarwin_ExterncTests, apzDarwin_ExterncPatch, 0 },
+
{ zDarwin_Gcc4_BreakageName, zDarwin_Gcc4_BreakageList,
apzDarwin_Gcc4_BreakageMachs,
DARWIN_GCC4_BREAKAGE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
GLIBC_C99_INLINE_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aGlibc_C99_Inline_1Tests, apzGlibc_C99_Inline_1Patch, 0 },
+ { zGlibc_C99_Inline_1aName, zGlibc_C99_Inline_1aList,
+ apzGlibc_C99_Inline_1aMachs,
+ GLIBC_C99_INLINE_1A_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aGlibc_C99_Inline_1aTests, apzGlibc_C99_Inline_1aPatch, 0 },
+
{ zGlibc_C99_Inline_2Name, zGlibc_C99_Inline_2List,
apzGlibc_C99_Inline_2Machs,
GLIBC_C99_INLINE_2_TEST_CT, FD_MACH_ONLY,
HPUX_EXTERN_ERRNO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aHpux_Extern_ErrnoTests, apzHpux_Extern_ErrnoPatch, 0 },
+ { zHpux11_Pthread_ConstName, zHpux11_Pthread_ConstList,
+ apzHpux11_Pthread_ConstMachs,
+ HPUX11_PTHREAD_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aHpux11_Pthread_ConstTests, apzHpux11_Pthread_ConstPatch, 0 },
+
{ zHpux_Pthread_InitializersName, zHpux_Pthread_InitializersList,
apzHpux_Pthread_InitializersMachs,
HPUX_PTHREAD_INITIALIZERS_TEST_CT, FD_MACH_ONLY,
NETBSD_C99_INLINE_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aNetbsd_C99_Inline_1Tests, apzNetbsd_C99_Inline_1Patch, 0 },
+ { zNetbsd_C99_Inline_2Name, zNetbsd_C99_Inline_2List,
+ apzNetbsd_C99_Inline_2Machs,
+ NETBSD_C99_INLINE_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aNetbsd_C99_Inline_2Tests, apzNetbsd_C99_Inline_2Patch, 0 },
+
{ zNetbsd_Extra_SemicolonName, zNetbsd_Extra_SemicolonList,
apzNetbsd_Extra_SemicolonMachs,
NETBSD_EXTRA_SEMICOLON_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
SOLARIS_MATH_4_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aSolaris_Math_4Tests, apzSolaris_Math_4Patch, 0 },
- { zSolaris_Math_5Name, zSolaris_Math_5List,
- apzSolaris_Math_5Machs,
- SOLARIS_MATH_5_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
- aSolaris_Math_5Tests, apzSolaris_Math_5Patch, 0 },
-
- { zSolaris_Math_6Name, zSolaris_Math_6List,
- apzSolaris_Math_6Machs,
- SOLARIS_MATH_6_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
- aSolaris_Math_6Tests, apzSolaris_Math_6Patch, 0 },
-
- { zSolaris_Math_7Name, zSolaris_Math_7List,
- apzSolaris_Math_7Machs,
- SOLARIS_MATH_7_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
- aSolaris_Math_7Tests, apzSolaris_Math_7Patch, 0 },
-
{ zSolaris_Math_8Name, zSolaris_Math_8List,
apzSolaris_Math_8Machs,
SOLARIS_MATH_8_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
OSDN Git Service
