*
* DO NOT EDIT THIS FILE (fixincl.x)
*
- * It has been AutoGen-ed Sunday August 16, 2009 at 08:59:30 AM EDT
+ * It has been AutoGen-ed Sunday June 5, 2011 at 09:04:54 PM CDT
* From the definitions inclhack.def
* and the template file fixincl
*/
-/* DO NOT SVN-MERGE THIS FILE, EITHER Sun Aug 16 08:59:30 EDT 2009
+/* DO NOT SVN-MERGE THIS FILE, EITHER Sun Jun 5 21:04:54 CDT 2011
*
* 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 211 fixup descriptions.
*
* See README for more information.
*
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Aix_Net_If_Arp fix
+ */
+tSCC zAix_Net_If_ArpName[] =
+ "aix_net_if_arp";
+
+/*
+ * File name selection pattern
+ */
+tSCC zAix_Net_If_ArpList[] =
+ "net/if_arp.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzAix_Net_If_ArpMachs[] = {
+ "*-*-aix*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zAix_Net_If_ArpSelect0[] =
+ "^struct fc_softc \\{";
+
+#define AIX_NET_IF_ARP_TEST_CT 1
+static tTestDesc aAix_Net_If_ArpTests[] = {
+ { TT_EGREP, zAix_Net_If_ArpSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Aix_Net_If_Arp
+ */
+static const char* apzAix_Net_If_ArpPatch[] = {
+ "format",
+ "typedef struct _fc_softc {",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Aix_Pthread fix
*/
tSCC zAix_PthreadName[] =
* File name selection pattern
*/
tSCC zAix_Stdint_1List[] =
- "stdint.h\0";
+ "stdint-aix.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
* File name selection pattern
*/
tSCC zAix_Stdint_2List[] =
- "stdint.h\0";
+ "stdint-aix.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
* File name selection pattern
*/
tSCC zAix_Stdint_3List[] =
- "stdint.h\0";
+ "stdint-aix.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
* File name selection pattern
*/
tSCC zAix_Stdint_4List[] =
- "stdint.h\0";
+ "stdint-aix.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
* File name selection pattern
*/
tSCC zAix_Stdint_5List[] =
- "stdint.h\0";
+ "stdint-aix.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
* content selection pattern - do fix if pattern found
*/
tSCC zAlpha_AssertSelect0[] =
- "(#define assert\\(EX\\).*)\\(\\(int\\) \\(EX\\)\\)";
+ "(#[ \t]*define assert\\(EX\\).*)\\(\\(int\\) \\(EX\\)\\)";
#define ALPHA_ASSERT_TEST_CT 1
static tTestDesc aAlpha_AssertTests[] = {
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Alpha_Wchar fix
- */
-tSCC zAlpha_WcharName[] =
- "alpha_wchar";
-
-/*
- * File name selection pattern
- */
-tSCC zAlpha_WcharList[] =
- "wchar.h\0";
-/*
- * Machine/OS name selection pattern
- */
-tSCC* apzAlpha_WcharMachs[] = {
- "alpha*-dec-osf4*",
- (const char*)NULL };
-
-/*
- * content selection pattern - do fix if pattern found
- */
-tSCC zAlpha_WcharSelect0[] =
- "#define wcstok wcstok_r";
-
-#define ALPHA_WCHAR_TEST_CT 1
-static tTestDesc aAlpha_WcharTests[] = {
- { TT_EGREP, zAlpha_WcharSelect0, (regex_t*)NULL }, };
-
-/*
- * Fix Command Arguments for Alpha_Wchar
- */
-static const char* apzAlpha_WcharPatch[] = { sed_cmd_z,
- "-e", "s@#define wcstok wcstok_r@extern wchar_t *wcstok __((wchar_t *, const wchar_t *, wchar_t **)) __asm__(\"wcstok_r\");@",
- "-e", "s@#define wcsftime __wcsftime_isoc@extern size_t wcsftime __((wchar_t *, size_t, const wchar_t *, const struct tm *)) __asm__(\"__wcsftime_isoc\");@",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
* Description of Avoid_Bool_Define fix
*/
tSCC zAvoid_Bool_DefineName[] =
* File name selection pattern
*/
tSCC zDarwin_Stdint_1List[] =
- "stdint.h\0";
+ "stdint-darwin.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
* File name selection pattern
*/
tSCC zDarwin_Stdint_2List[] =
- "stdint.h\0";
+ "stdint-darwin.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
* File name selection pattern
*/
tSCC zDarwin_Stdint_3List[] =
- "stdint.h\0";
+ "stdint-darwin.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
* File name selection pattern
*/
tSCC zDarwin_Stdint_4List[] =
- "stdint.h\0";
+ "stdint-darwin.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
* File name selection pattern
*/
tSCC zDarwin_Stdint_5List[] =
- "stdint.h\0";
+ "stdint-darwin.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
* File name selection pattern
*/
tSCC zDarwin_Stdint_6List[] =
- "stdint.h\0";
+ "stdint-darwin.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
* File name selection pattern
*/
tSCC zDarwin_Stdint_7List[] =
- "stdint.h\0";
+ "stdint-darwin.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
* Fix Command Arguments for Glibc_C99_Inline_2
*/
static const char* apzGlibc_C99_Inline_2Patch[] = { sed_cmd_z,
- "-e", "s/extern int \\(stat\\|lstat\\|fstat\\|mknod\\)/#ifdef __GNUC_GNU_INLINE__\\\n\
+ "-e", "s/extern int \\(stat\\)/#ifdef __GNUC_GNU_INLINE__\\\n\
+extern\\\n\
+#endif\\\n\
+__inline__ int \\1/",
+ "-e", "s/extern int \\([lf]stat\\)/#ifdef __GNUC_GNU_INLINE__\\\n\
+extern\\\n\
+#endif\\\n\
+__inline__ int \\1/",
+ "-e", "s/extern int \\(mknod\\)/#ifdef __GNUC_GNU_INLINE__\\\n\
extern\\\n\
#endif\\\n\
__inline__ int \\1/",
- "-e", "s/extern int __REDIRECT\\(_NTH\\|\\) (\\(stat\\|lstat\\|fstat\\)/#ifdef __GNUC_GNU_INLINE__\\\n\
+ "-e", "s/extern int __REDIRECT\\(_NTH\\)\\{0,1\\} (\\(stat\\)/#ifdef __GNUC_GNU_INLINE__\\\n\
+extern\\\n\
+#endif\\\n\
+__inline__ int __REDIRECT\\1 (\\2/",
+ "-e", "s/extern int __REDIRECT\\(_NTH\\)\\{0,1\\} (\\([lf]stat\\)/#ifdef __GNUC_GNU_INLINE__\\\n\
extern\\\n\
#endif\\\n\
__inline__ int __REDIRECT\\1 (\\2/",
* Fix Command Arguments for Glibc_Mutex_Init
*/
static const char* apzGlibc_Mutex_InitPatch[] = { sed_cmd_z,
- "-e", "/define[ \t]\\+PTHREAD_MUTEX_INITIALIZER[ \t]*\\\\/{\n\
+ "-e", "/define[ \t]\\{1,\\}PTHREAD_MUTEX_INITIALIZER[ \t]*\\\\/{\n\
N\n\
s/{ { 0, } }/{ { 0, 0, 0, 0, 0, 0 } }/\n\
}",
- "-e", "s/{ \\(0, 0, 0, 0, PTHREAD_MUTEX_\\(RECURSIVE\\|ERRORCHECK\\|ADAPTIVE\\)_NP\\) }/{ \\1, 0 }/",
- "-e", "s/{ \\(0, 0, 0, PTHREAD_MUTEX_\\(RECURSIVE\\|ERRORCHECK\\|ADAPTIVE\\)_NP\\) }/{ \\1, 0, 0 }/",
- "-e", "/define[ \t]\\+PTHREAD_RWLOCK_INITIALIZER[ \t]*\\\\/N;s/^[ \t]*#[ \t]*\\(define[ \t]\\+PTHREAD_RWLOCK_INITIALIZER[ \t]*\\\\\\)\\n[ \t]*{ { 0, } }/# if __WORDSIZE == 64\\n# \\1\\n { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }\\n# else\\n# \\1\\n { { 0, 0, 0, 0, 0, 0, 0, 0 } }\\n# endif/",
+ "-e", "s/{ \\(0, 0, 0, 0, PTHREAD_MUTEX_\\(RECURSIVE\\)_NP\\) }/{ \\1, 0 }/",
+ "-e", "s/{ \\(0, 0, 0, 0, PTHREAD_MUTEX_\\(ERRORCHECK\\)_NP\\) }/{ \\1, 0 }/",
+ "-e", "s/{ \\(0, 0, 0, 0, PTHREAD_MUTEX_\\(ADAPTIVE\\)_NP\\) }/{ \\1, 0 }/",
+ "-e", "s/{ \\(0, 0, 0, PTHREAD_MUTEX_\\(RECURSIVE\\)_NP\\) }/{ \\1, 0, 0 }/",
+ "-e", "s/{ \\(0, 0, 0, PTHREAD_MUTEX_\\(ERRORCHECK\\)_NP\\) }/{ \\1, 0, 0 }/",
+ "-e", "s/{ \\(0, 0, 0, PTHREAD_MUTEX_\\(ADAPTIVE\\)_NP\\) }/{ \\1, 0, 0 }/",
+ "-e", "/define[ \t]\\{1,\\}PTHREAD_RWLOCK_INITIALIZER[ \t]*\\\\/N;s/^[ \t]*#[ \t]*\\(define[ \t]\\{1,\\}PTHREAD_RWLOCK_INITIALIZER[ \t]*\\\\\\)\\n[ \t]*{ { 0, } }/# if __WORDSIZE == 64\\\n\
+# \\1\\\n\
+ { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }\\\n\
+# else\\\n\
+# \\1\\\n\
+ { { 0, 0, 0, 0, 0, 0, 0, 0 } }\\\n\
+# endif/",
"-e", "s/{ \\(0, 0, 0, 0, 0, 0, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP\\) }/{ \\1, 0 }/",
- "-e", "/define[ \t]\\+PTHREAD_COND_INITIALIZER/s/{ { 0, } }/{ { 0, 0, 0, 0, 0, (void *) 0, 0, 0 } }/",
+ "-e", "/define[ \t]\\{1,\\}PTHREAD_COND_INITIALIZER/s/{ { 0, } }/{ { 0, 0, 0, 0, 0, (void *) 0, 0, 0 } }/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Glibc_Strncpy fix
+ */
+tSCC zGlibc_StrncpyName[] =
+ "glibc_strncpy";
+
+/*
+ * File name selection pattern
+ */
+tSCC zGlibc_StrncpyList[] =
+ "bits/string2.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+#define apzGlibc_StrncpyMachs (const char**)NULL
+
+/*
+ * content bypass pattern - skip fix if pattern found
+ */
+tSCC zGlibc_StrncpyBypass0[] =
+ "__builtin_strncpy";
+
+#define GLIBC_STRNCPY_TEST_CT 1
+static tTestDesc aGlibc_StrncpyTests[] = {
+ { TT_NEGREP, zGlibc_StrncpyBypass0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Glibc_Strncpy
+ */
+static const char* apzGlibc_StrncpyPatch[] = {
+ "format",
+ "# define strncpy(dest, src, n) __builtin_strncpy (dest, src, n)",
+ "# define strncpy([^\n\
+]*\\\\\n\
+)*[^\n\
+]*",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Glibc_Tgmath fix
*/
tSCC zGlibc_TgmathName[] =
* content selection pattern - do fix if pattern found
*/
tSCC zHpux_HtonlSelect0[] =
- "#ifndef _XOPEN_SOURCE_EXTENDED\n\
+ "#ifndef _XOPEN_SOURCE_EXTENDED[ \t]*\n\
(/\\*\n\
\\* Macros for number representation conversion\\.\n\
\\*/\n\
* File name selection pattern
*/
tSCC zHpux_C99_IntptrList[] =
- "stdint.h\0";
+ "stdint-hpux11.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
* File name selection pattern
*/
tSCC zHpux_C99_InttypesList[] =
- "inttypes.h\0stdint.h\0";
+ "inttypes.h\0stdint-hpux11.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
* File name selection pattern
*/
tSCC zHpux_C99_Inttypes2List[] =
- "stdint.h\0";
+ "stdint-hpux11.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * 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
+ * Description of Hpux_Stdint_Least_Fast fix
*/
-tSCC zHpux_Stdint_FastName[] =
- "hpux_stdint_fast";
+tSCC zHpux_Stdint_Least_FastName[] =
+ "hpux_stdint_least_fast";
/*
* File name selection pattern
*/
-tSCC zHpux_Stdint_FastList[] =
- "stdint.h\0";
+tSCC zHpux_Stdint_Least_FastList[] =
+ "stdint-hpux11.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
-tSCC* apzHpux_Stdint_FastMachs[] = {
+tSCC* apzHpux_Stdint_Least_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.*";
+tSCC zHpux_Stdint_Least_FastSelect0[] =
+ "^[ \t]*#[ \t]*define[ \t]+UINT_(LEAST|FAST)64_MAX[ \t]+ULLONG_MAX";
-#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 }, };
+#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_Inttype_Int_Least8_T
+ * Fix Command Arguments for Hpux_Stdint_Least_Fast
*/
-static const char* apzHpux_Inttype_Int_Least8_TPatch[] = {
+static const char* apzHpux_Stdint_Least_FastPatch[] = {
"format",
- "typedef signed char int_least8_t;",
+ "# define\tUINT_%164_MAX\t__UINT64_MAX__",
(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 };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*/
static const char* apzHpux_Imaginary_IPatch[] = {
"format",
- "# define _Complex_I (__extension__ 1.0iF)",
+ "#define _Complex_I (__extension__ 1.0iF)",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Irix_Complex fix
+ */
+tSCC zIrix_ComplexName[] =
+ "irix_complex";
+
+/*
+ * File name selection pattern
+ */
+tSCC zIrix_ComplexList[] =
+ "complex.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzIrix_ComplexMachs[] = {
+ "mips-sgi-irix6.5",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zIrix_ComplexSelect0[] =
+ "#define[ \t]_Complex_I[ \t]\\(\\(float[ \t]_Complex\\)[ \t]\\(__I__\\)\\)";
+
+#define IRIX_COMPLEX_TEST_CT 1
+static tTestDesc aIrix_ComplexTests[] = {
+ { TT_EGREP, zIrix_ComplexSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Irix_Complex
+ */
+static const char* apzIrix_ComplexPatch[] = { sed_cmd_z,
+ "-e", "s/#define[ \t]_Complex_I[ \t]((float[ \t]_Complex)[ \t](__I__))/#define _Complex_I (__extension__ 1.0iF)/",
+ "-e", "/#define[ \t]imaginary[ \t]_Imaginary/d",
+ "-e", "/#define[ \t]_Imaginary_I/d",
+ "-e", "s/#define[ \t]I[ \t]_Imaginary_I/#define I _Complex_I/",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Irix_Limits_Const fix
*/
tSCC zIrix_Limits_ConstName[] =
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Irix_Pthread_Init fix
+ */
+tSCC zIrix_Pthread_InitName[] =
+ "irix_pthread_init";
+
+/*
+ * File name selection pattern
+ */
+tSCC zIrix_Pthread_InitList[] =
+ "pthread.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzIrix_Pthread_InitMachs[] = {
+ "mips-sgi-irix6.5",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zIrix_Pthread_InitSelect0[] =
+ "^(#define[ \t]+PTHREAD_.*_INITIALIZER[ \t]+)(\\{ 0 \\})";
+
+#define IRIX_PTHREAD_INIT_TEST_CT 1
+static tTestDesc aIrix_Pthread_InitTests[] = {
+ { TT_EGREP, zIrix_Pthread_InitSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Irix_Pthread_Init
+ */
+static const char* apzIrix_Pthread_InitPatch[] = {
+ "format",
+ "%1{ %2 }",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Irix_Socklen_T fix
*/
tSCC zIrix_Socklen_TName[] =
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Irix_Stdint_C99 fix
+ * Description of Irix_Stdint_C99_Mode fix
*/
-tSCC zIrix_Stdint_C99Name[] =
- "irix_stdint_c99";
+tSCC zIrix_Stdint_C99_ModeName[] =
+ "irix_stdint_c99_mode";
/*
* File name selection pattern
*/
-tSCC zIrix_Stdint_C99List[] =
+tSCC zIrix_Stdint_C99_ModeList[] =
"stdint.h\0";
/*
* Machine/OS name selection pattern
*/
-tSCC* apzIrix_Stdint_C99Machs[] = {
+tSCC* apzIrix_Stdint_C99_ModeMachs[] = {
"mips-sgi-irix6.5",
(const char*)NULL };
/*
* content selection pattern - do fix if pattern found
*/
-tSCC zIrix_Stdint_C99Select0[] =
+tSCC zIrix_Stdint_C99_ModeSelect0[] =
"(#ifndef __c99\n\
)(#error This header file is to be used only for c99 mode compilations)";
-#define IRIX_STDINT_C99_TEST_CT 1
-static tTestDesc aIrix_Stdint_C99Tests[] = {
- { TT_EGREP, zIrix_Stdint_C99Select0, (regex_t*)NULL }, };
+#define IRIX_STDINT_C99_MODE_TEST_CT 1
+static tTestDesc aIrix_Stdint_C99_ModeTests[] = {
+ { TT_EGREP, zIrix_Stdint_C99_ModeSelect0, (regex_t*)NULL }, };
/*
- * Fix Command Arguments for Irix_Stdint_C99
+ * Fix Command Arguments for Irix_Stdint_C99_Mode
*/
-static const char* apzIrix_Stdint_C99Patch[] = {
+static const char* apzIrix_Stdint_C99_ModePatch[] = {
"format",
"#if 0\n\
%2",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Irix_Stdio_Va_List fix
+ * Description of Irix_Stdint_C99_Types fix
*/
-tSCC zIrix_Stdio_Va_ListName[] =
- "irix_stdio_va_list";
+tSCC zIrix_Stdint_C99_TypesName[] =
+ "irix_stdint_c99_types";
/*
* File name selection pattern
*/
-tSCC zIrix_Stdio_Va_ListList[] =
- "stdio.h\0internal/stdio_core.h\0";
+tSCC zIrix_Stdint_C99_TypesList[] =
+ "stdint-irix65.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
-#define apzIrix_Stdio_Va_ListMachs (const char**)NULL
-
-/*
- * content selection pattern - do fix if pattern found
- */
-tSCC zIrix_Stdio_Va_ListSelect0[] =
- "/\\* va_list \\*/ char \\*";
-
-#define IRIX_STDIO_VA_LIST_TEST_CT 1
-static tTestDesc aIrix_Stdio_Va_ListTests[] = {
- { TT_EGREP, zIrix_Stdio_Va_ListSelect0, (regex_t*)NULL }, };
+tSCC* apzIrix_Stdint_C99_TypesMachs[] = {
+ "mips-sgi-irix6.5",
+ (const char*)NULL };
+#define IRIX_STDINT_C99_TYPES_TEST_CT 0
+#define aIrix_Stdint_C99_TypesTests (tTestDesc*)NULL
/*
- * Fix Command Arguments for Irix_Stdio_Va_List
+ * Fix Command Arguments for Irix_Stdint_C99_Types
*/
-static const char* apzIrix_Stdio_Va_ListPatch[] = {
- "format",
- "__gnuc_va_list",
+static const char* apzIrix_Stdint_C99_TypesPatch[] = { sed_cmd_z,
+ "-e", "s@^#define INT64_MIN.*(-0x7fffffffffffffff - 1)$@#define INT64_MIN (-0x7fffffffffffffffLL - 1)@",
+ "-e", "s@^#define INT64_MAX.*0x7fffffffffffffff$@#define INT64_MAX 0x7fffffffffffffffLL@",
+ "-e", "s@^#define UINT32_MAX.*0xffffffff$@#define UINT32_MAX 0xffffffffU@",
+ "-e", "s@^#define UINT64_MAX.*0xffffffffffffffff$@#define UINT64_MAX 0xffffffffffffffffULL@",
+ "-e", "s@^#define INTPTR_MIN.*INT32_MIN$@#define INTPTR_MIN (-0x7fffffffL - 1)@",
+ "-e", "s@^#define INTPTR_MAX.*INT32_MAX$@#define INTPTR_MAX 0x7fffffffL@",
+ "-e", "s@^#define UINTPTR_MAX.*UINT32_MAX$@#define UINTPTR_MAX 0xffffffffUL@",
+ "-e", "s@^#define INTPTR_MIN.*INT64_MIN@#define INTPTR_MIN (-0x7fffffffffffffffL - 1)@",
+ "-e", "s@^#define INTPTR_MAX.*INT64_MAX$@#define INTPTR_MAX 0x7fffffffffffffffL@",
+ "-e", "s@^#define UINTPTR_MAX.*UINT64_MAX$@#define UINTPTR_MAX 0xffffffffffffffffUL@",
+ "-e", "s@^#define PTRDIFF_MIN.*INT64_MIN$@#define PTRDIFF_MIN (-0x7fffffffffffffffL - 1)@",
+ "-e", "s@^#define PTRDIFF_MAX.*INT64_MAX$@#define PTRDIFF_MAX 0x7fffffffffffffffL@",
+ "-e", "s@^#define SIZE_MAX.*UINT64_MAX$@#define SIZE_MAX 0xffffffffffffffffUL@",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Irix_Wcsftime fix
+ * Description of Irix_Stdint_C99_Macros fix
*/
-tSCC zIrix_WcsftimeName[] =
- "irix_wcsftime";
+tSCC zIrix_Stdint_C99_MacrosName[] =
+ "irix_stdint_c99_macros";
/*
* File name selection pattern
*/
-tSCC zIrix_WcsftimeList[] =
- "internal/wchar_core.h\0";
+tSCC zIrix_Stdint_C99_MacrosList[] =
+ "stdint-irix65.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
-tSCC* apzIrix_WcsftimeMachs[] = {
+tSCC* apzIrix_Stdint_C99_MacrosMachs[] = {
"mips-sgi-irix6.5",
(const char*)NULL };
+#define IRIX_STDINT_C99_MACROS_TEST_CT 0
+#define aIrix_Stdint_C99_MacrosTests (tTestDesc*)NULL
/*
- * content selection pattern - do fix if pattern found
+ * Fix Command Arguments for Irix_Stdint_C99_Macros
*/
-tSCC zIrix_WcsftimeSelect0[] =
- "#if _NO_XOPEN5\n\
-(extern size_t[ \t]+wcsftime.*const char *.*)";
-
-#define IRIX_WCSFTIME_TEST_CT 1
-static tTestDesc aIrix_WcsftimeTests[] = {
- { TT_EGREP, zIrix_WcsftimeSelect0, (regex_t*)NULL }, };
-
-/*
- * Fix Command Arguments for Irix_Wcsftime
- */
-static const char* apzIrix_WcsftimePatch[] = {
- "format",
- "#if _NO_XOPEN5 && !defined(__c99)\n\
-%1",
+static const char* apzIrix_Stdint_C99_MacrosPatch[] = { sed_cmd_z,
+ "-e", "s@^#define INT8_C(x).*int.*_t.*$@#define INT8_C(x) (x)@",
+ "-e", "s@^#define INT16_C(x).*int.*_t.*$@#define INT16_C(x) (x)@",
+ "-e", "s@^#define INT32_C(x).*int.*_t.*$@#define INT32_C(x) (x)@",
+ "-e", "s@^#define INT64_C(x).*int.*_t.*$@#define INT64_C(x) (x ## LL)@",
+ "-e", "s@^#define UINT8_C(x).*int.*_t.*$@#define UINT8_C(x) (x)@",
+ "-e", "s@^#define UINT16_C(x).*int.*_t.*$@#define UINT16_C(x) (x)@",
+ "-e", "s@^#define UINT32_C(x).*int.*_t.*$@#define UINT32_C(x) (x ## U)@",
+ "-e", "s@^#define UINT64_C(x).*int.*_t.*$@#define UINT64_C(x) (x ## ULL)@",
+ "-e", "s@^#define INTMAX_C(x).*int.*_t.*$@#define INTMAX_C(x) (x ## LL)@",
+ "-e", "s@^#define UINTMAX_C(x).*int.*_t.*$@#define UINTMAX_C(x) (x ## ULL)@",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Isc_Fmod fix
+ * Description of Irix_Stdio_Va_List fix
*/
-tSCC zIsc_FmodName[] =
- "isc_fmod";
+tSCC zIrix_Stdio_Va_ListName[] =
+ "irix_stdio_va_list";
/*
* File name selection pattern
*/
-tSCC zIsc_FmodList[] =
- "math.h\0";
+tSCC zIrix_Stdio_Va_ListList[] =
+ "stdio.h\0internal/stdio_core.h\0";
/*
* Machine/OS name selection pattern
*/
-#define apzIsc_FmodMachs (const char**)NULL
+#define apzIrix_Stdio_Va_ListMachs (const char**)NULL
/*
* content selection pattern - do fix if pattern found
*/
-tSCC zIsc_FmodSelect0[] =
- "fmod\\(double\\)";
+tSCC zIrix_Stdio_Va_ListSelect0[] =
+ "/\\* va_list \\*/ char \\*";
-#define ISC_FMOD_TEST_CT 1
-static tTestDesc aIsc_FmodTests[] = {
- { TT_EGREP, zIsc_FmodSelect0, (regex_t*)NULL }, };
+#define IRIX_STDIO_VA_LIST_TEST_CT 1
+static tTestDesc aIrix_Stdio_Va_ListTests[] = {
+ { TT_EGREP, zIrix_Stdio_Va_ListSelect0, (regex_t*)NULL }, };
/*
- * Fix Command Arguments for Isc_Fmod
+ * Fix Command Arguments for Irix_Stdio_Va_List
*/
-static const char* apzIsc_FmodPatch[] = {
+static const char* apzIrix_Stdio_Va_ListPatch[] = {
"format",
- "fmod(double, double)",
+ "__gnuc_va_list",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Isc_Omits_With_Stdc fix
+ * Description of Irix_Wcsftime fix
*/
-tSCC zIsc_Omits_With_StdcName[] =
- "isc_omits_with_stdc";
+tSCC zIrix_WcsftimeName[] =
+ "irix_wcsftime";
/*
* File name selection pattern
*/
-tSCC zIsc_Omits_With_StdcList[] =
- "stdio.h\0math.h\0ctype.h\0sys/limits.h\0sys/fcntl.h\0sys/dirent.h\0";
+tSCC zIrix_WcsftimeList[] =
+ "internal/wchar_core.h\0";
/*
* Machine/OS name selection pattern
*/
-#define apzIsc_Omits_With_StdcMachs (const char**)NULL
+tSCC* apzIrix_WcsftimeMachs[] = {
+ "mips-sgi-irix6.5",
+ (const char*)NULL };
/*
* content selection pattern - do fix if pattern found
*/
-tSCC zIsc_Omits_With_StdcSelect0[] =
- "!defined\\(__STDC__\\) && !defined\\(_POSIX_SOURCE\\)";
+tSCC zIrix_WcsftimeSelect0[] =
+ "#if _NO_XOPEN5\n\
+(extern size_t[ \t]+wcsftime.*const char *.*)";
-#define ISC_OMITS_WITH_STDC_TEST_CT 1
-static tTestDesc aIsc_Omits_With_StdcTests[] = {
- { TT_EGREP, zIsc_Omits_With_StdcSelect0, (regex_t*)NULL }, };
+#define IRIX_WCSFTIME_TEST_CT 1
+static tTestDesc aIrix_WcsftimeTests[] = {
+ { TT_EGREP, zIrix_WcsftimeSelect0, (regex_t*)NULL }, };
/*
- * Fix Command Arguments for Isc_Omits_With_Stdc
+ * Fix Command Arguments for Irix_Wcsftime
*/
-static const char* apzIsc_Omits_With_StdcPatch[] = {
+static const char* apzIrix_WcsftimePatch[] = {
"format",
- "!defined(_POSIX_SOURCE)",
+ "#if _NO_XOPEN5 && !defined(__c99)\n\
+%1",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Nested_Sys_Limits fix
- */
-tSCC zNested_Sys_LimitsName[] =
- "nested_sys_limits";
-
-/*
- * File name selection pattern
- */
-tSCC zNested_Sys_LimitsList[] =
- "sys/limits.h\0";
-/*
- * Machine/OS name selection pattern
- */
-#define apzNested_Sys_LimitsMachs (const char**)NULL
-
-/*
- * content selection pattern - do fix if pattern found
- */
-tSCC zNested_Sys_LimitsSelect0[] =
- "CHILD_MAX";
-
-#define NESTED_SYS_LIMITS_TEST_CT 1
-static tTestDesc aNested_Sys_LimitsTests[] = {
- { TT_EGREP, zNested_Sys_LimitsSelect0, (regex_t*)NULL }, };
-
-/*
- * Fix Command Arguments for Nested_Sys_Limits
- */
-static const char* apzNested_Sys_LimitsPatch[] = { sed_cmd_z,
- "-e", "/CHILD_MAX/s,/\\* Max, Max,",
- "-e", "/OPEN_MAX/s,/\\* Max, Max,",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
* Description of Netbsd_C99_Inline_1 fix
*/
tSCC zNetbsd_C99_Inline_1Name[] =
* File name selection pattern
*/
tSCC zNewlib_Stdint_1List[] =
- "stdint.h\0";
+ "stdint-newlib.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
* File name selection pattern
*/
tSCC zNewlib_Stdint_2List[] =
- "stdint.h\0";
+ "stdint-newlib.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Sco_Math fix
+ * Description of Solaris___Restrict fix
*/
-tSCC zSco_MathName[] =
- "sco_math";
+tSCC zSolaris___RestrictName[] =
+ "solaris___restrict";
/*
* File name selection pattern
*/
-tSCC zSco_MathList[] =
- "math.h\0*/math.h\0";
+tSCC zSolaris___RestrictList[] =
+ "sys/feature_tests.h\0";
/*
* Machine/OS name selection pattern
*/
-#define apzSco_MathMachs (const char**)NULL
+tSCC* apzSolaris___RestrictMachs[] = {
+ "*-*-solaris2*",
+ (const char*)NULL };
/*
* content selection pattern - do fix if pattern found
*/
-tSCC zSco_MathSelect0[] =
- "inline double abs";
+tSCC zSolaris___RestrictSelect0[] =
+ "#define[ \t]*_RESTRICT_KYWD[ \t]*restrict";
+
+#define SOLARIS___RESTRICT_TEST_CT 1
+static tTestDesc aSolaris___RestrictTests[] = {
+ { TT_EGREP, zSolaris___RestrictSelect0, (regex_t*)NULL }, };
/*
- * content bypass pattern - skip fix if pattern found
+ * Fix Command Arguments for Solaris___Restrict
*/
-tSCC zSco_MathBypass0[] =
- "__GNUG__";
+static const char* apzSolaris___RestrictPatch[] = {
+ "format",
+ "#ifdef __cplusplus\n\
+#define\t_RESTRICT_KYWD\t__restrict\n\
+#else\n\
+%0\n\
+#endif",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Solaris_Complex fix
+ */
+tSCC zSolaris_ComplexName[] =
+ "solaris_complex";
+
+/*
+ * File name selection pattern
+ */
+tSCC zSolaris_ComplexList[] =
+ "complex.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzSolaris_ComplexMachs[] = {
+ "*-*-solaris2.*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_ComplexSelect0[] =
+ "#define[ \t]_Complex_I[ \t]_Complex_I";
+
+#define SOLARIS_COMPLEX_TEST_CT 1
+static tTestDesc aSolaris_ComplexTests[] = {
+ { TT_EGREP, zSolaris_ComplexSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Solaris_Complex
+ */
+static const char* apzSolaris_ComplexPatch[] = { sed_cmd_z,
+ "-e", "s/#define[ \t]_Complex_I[ \t]_Complex_I/#define\t_Complex_I\t(__extension__ 1.0iF)/",
+ "-e", "/#define[ \t]_Imaginary_I[ \t]_Imaginary_I/d",
+ "-e", "/#define[ \t]imaginary[ \t]_Imaginary/d",
+ "-e", "s/#define[ \t]I[ \t]\\{1,\\}_Imaginary_I/#define\tI\t\t_Complex_I/",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Solaris_Complex_Cxx fix
+ */
+tSCC zSolaris_Complex_CxxName[] =
+ "solaris_complex_cxx";
-#define SCO_MATH_TEST_CT 2
-static tTestDesc aSco_MathTests[] = {
- { TT_NEGREP, zSco_MathBypass0, (regex_t*)NULL },
- { TT_EGREP, zSco_MathSelect0, (regex_t*)NULL }, };
+/*
+ * File name selection pattern
+ */
+tSCC zSolaris_Complex_CxxList[] =
+ "complex.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzSolaris_Complex_CxxMachs[] = {
+ "*-*-solaris2.*",
+ (const char*)NULL };
+#define SOLARIS_COMPLEX_CXX_TEST_CT 0
+#define aSolaris_Complex_CxxTests (tTestDesc*)NULL
/*
- * Fix Command Arguments for Sco_Math
+ * Fix Command Arguments for Solaris_Complex_Cxx
*/
-static const char* apzSco_MathPatch[] = { sed_cmd_z,
- "-e", "/#define.*__fp_class(a) \\\\/i\\\n\
-#ifndef __GNUC__\n",
- "-e", "/.*__builtin_generic/a\\\n\
-#else\\\n\
-#define __fp_class(a) \\\\\\\n\
- __builtin_choose_expr(__builtin_types_compatible_p(typeof(a),long double),\\\\\\\n\
- __fpclassifyl(a), \\\\\\\n\
- __builtin_choose_expr(__builtin_types_compatible_p(typeof(a), float), \\\\\\\n\
- __fpclassifyf(a),__fpclassify(a)))\\\n\
+static const char* apzSolaris_Complex_CxxPatch[] = { sed_cmd_z,
+ "-e", "/#if[ \t]*!defined(__cplusplus)/c\\\n\
+#ifdef\t__cplusplus\\\n\
+extern \"C\" {\\\n\
+#endif",
+ "-e", "/#endif[ \t]*\\/\\* !defined(__cplusplus) \\*\\//c\\\n\
+#ifdef\t__cplusplus\\\n\
+}\\\n\
#endif",
- "-e", "/extern \"C\\+\\+\"/N;/inline double abs/i\\\n\
-#ifndef __GNUC__\n",
- "-e", "/inline long double trunc/N;/inline long double trunc.*}.*extern \"C\\+\\+\"/a\\\n\
-#endif /* ! __GNUC__ */",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Solaris_Cond_Init fix
+ */
+tSCC zSolaris_Cond_InitName[] =
+ "solaris_cond_init";
+
+/*
+ * File name selection pattern
+ */
+tSCC zSolaris_Cond_InitList[] =
+ "pthread.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzSolaris_Cond_InitMachs[] = {
+ "*-*-solaris2.8",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_Cond_InitSelect0[] =
+ "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+
+#define SOLARIS_COND_INIT_TEST_CT 1
+static tTestDesc aSolaris_Cond_InitTests[] = {
+ { TT_EGREP, zSolaris_Cond_InitSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Solaris_Cond_Init
+ */
+static const char* apzSolaris_Cond_InitPatch[] = {
+ "format",
+ "%1, 0x4356%2",
+ "^(#define[ \t]+PTHREAD_COND_INITIALIZER[ \t]+\\{.*0)(\\},[ \t]*0\\}.*)$",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
* content selection pattern - do fix if pattern found
*/
tSCC zSolaris_Math_8Select0[] =
- "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+ "@\\(#\\)math_c99\\.h[ \t]+1\\.[0-9]+[ \t]+[0-9/]+ SMI";
/*
* content bypass pattern - skip fix if pattern found
/*
* Machine/OS name selection pattern
*/
-#define apzSolaris_Int_ConstMachs (const char**)NULL
+tSCC* apzSolaris_Int_ConstMachs[] = {
+ "*-*-solaris2*",
+ (const char*)NULL };
/*
* content selection pattern - do fix if pattern found
*/
tSCC zSolaris_Int_ConstSelect0[] =
- "@\\(#\\)int_const.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+ "^#define[ \t]+UINT8_C\\(c\\)[ \t]+__CONCAT__.*\n\
+(/*.**/)\n\
+#define[ \t]+UINT16_C\\(c\\)[ \t]+__CONCAT__.*";
#define SOLARIS_INT_CONST_TEST_CT 1
static tTestDesc aSolaris_Int_ConstTests[] = {
"#define\tUINT8_C(c)\t(c)\n\
%1\n\
#define\tUINT16_C(c)\t(c)",
- "^#define[ \t]+UINT8_C\\(c\\)[ \t]+__CONCAT__.*\n\
-(/*.**/)\n\
-#define[ \t]+UINT16_C\\(c\\)[ \t]+__CONCAT__.*",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
/*
* Machine/OS name selection pattern
*/
-#define apzSolaris_Int_Limits_1Machs (const char**)NULL
+tSCC* apzSolaris_Int_Limits_1Machs[] = {
+ "*-*-solaris2*",
+ (const char*)NULL };
/*
* content selection pattern - do fix if pattern found
*/
tSCC zSolaris_Int_Limits_1Select0[] =
- "@\\(#\\)int_limits.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+ "^#define[ \t]+UINT8_MAX[ \t]+\\(255U\\)\n\
+#define[ \t]+UINT16_MAX[ \t]+\\(65535U\\)";
#define SOLARIS_INT_LIMITS_1_TEST_CT 1
static tTestDesc aSolaris_Int_Limits_1Tests[] = {
"format",
"#define\tUINT8_MAX\t(255)\n\
#define\tUINT16_MAX\t(65535)",
- "^#define[ \t]+UINT8_MAX[ \t]+\\(255U\\)\n\
-#define[ \t]+UINT16_MAX[ \t]+\\(65535U\\)",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
/*
* Machine/OS name selection pattern
*/
-#define apzSolaris_Int_Limits_2Machs (const char**)NULL
+tSCC* apzSolaris_Int_Limits_2Machs[] = {
+ "*-*-solaris2*",
+ (const char*)NULL };
/*
* content selection pattern - do fix if pattern found
*/
tSCC zSolaris_Int_Limits_2Select0[] =
- "@\\(#\\)int_limits.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+ "^#define[ \t]+(INT|UINT)_FAST16_(MAX|MIN)[ \t](INT|UINT)16.*";
#define SOLARIS_INT_LIMITS_2_TEST_CT 1
static tTestDesc aSolaris_Int_Limits_2Tests[] = {
static const char* apzSolaris_Int_Limits_2Patch[] = {
"format",
"#define\t%1_FAST16_%2 %132_%2",
- "^#define[ \t]+(INT|UINT)_FAST16_(MAX|MIN)[ \t](INT|UINT)16.*",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Solaris_Int_Limits_3 fix
+ */
+tSCC zSolaris_Int_Limits_3Name[] =
+ "solaris_int_limits_3";
+
+/*
+ * File name selection pattern
+ */
+tSCC zSolaris_Int_Limits_3List[] =
+ "sys/int_limits.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzSolaris_Int_Limits_3Machs[] = {
+ "*-*-solaris2*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_Int_Limits_3Select0[] =
+ "^#define[ \t]+SIZE_MAX[ \t]+4294967295UL";
+
+#define SOLARIS_INT_LIMITS_3_TEST_CT 1
+static tTestDesc aSolaris_Int_Limits_3Tests[] = {
+ { TT_EGREP, zSolaris_Int_Limits_3Select0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Solaris_Int_Limits_3
+ */
+static const char* apzSolaris_Int_Limits_3Patch[] = {
+ "format",
+ "#define\tSIZE_MAX\t4294967295U",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Solaris_Sys_Va_List fix
+ */
+tSCC zSolaris_Sys_Va_ListName[] =
+ "solaris_sys_va_list";
+
+/*
+ * File name selection pattern
+ */
+tSCC zSolaris_Sys_Va_ListList[] =
+ "sys/va_list.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzSolaris_Sys_Va_ListMachs[] = {
+ "*-*-solaris2.[89]",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_Sys_Va_ListSelect0[] =
+ "#if.*__STDC__.*\n\
+typedef void \\*__va_list;\n\
+#else\n\
+typedef char \\*__va_list;\n\
+#endif";
+
+#define SOLARIS_SYS_VA_LIST_TEST_CT 1
+static tTestDesc aSolaris_Sys_Va_ListTests[] = {
+ { TT_EGREP, zSolaris_Sys_Va_ListSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Solaris_Sys_Va_List
+ */
+static const char* apzSolaris_Sys_Va_ListPatch[] = {
+ "format",
+ "#ifdef __GNUC__\n\
+typedef __builtin_va_list __va_list;\n\
+#else\n\
+%0\n\
+#endif",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Statsswtch fix
*/
tSCC zStatsswtchName[] =
static const char* apzX11_NewPatch[] = { sed_cmd_z,
"-e", "/Widget\told, new;/i\\\n\
#ifdef __cplusplus\\\n\
-\tWidget\told, c_new;\\\n\
+\\\tWidget\told, c_new;\\\n\
#else\n",
"-e", "/Widget\told, new;/a\\\n\
#endif\n",
*
* List of all fixes
*/
-#define REGEX_COUNT 249
+#define REGEX_COUNT 250
#define MACH_LIST_SIZE_LIMIT 181
-#define FIX_COUNT 206
+#define FIX_COUNT 211
/*
* Enumerate the fixes
AAB_SOLARIS_SYS_VARARGS_H_FIXIDX,
AAB_SUN_MEMCPY_FIXIDX,
AIX_COMPLEX_FIXIDX,
+ AIX_NET_IF_ARP_FIXIDX,
AIX_PTHREAD_FIXIDX,
AIX_STDINT_1_FIXIDX,
AIX_STDINT_2_FIXIDX,
ALPHA_PTHREAD_GCC_FIXIDX,
ALPHA_PTHREAD_INIT_FIXIDX,
ALPHA_SBRK_FIXIDX,
- ALPHA_WCHAR_FIXIDX,
AVOID_BOOL_DEFINE_FIXIDX,
AVOID_BOOL_TYPE_FIXIDX,
AVOID_WCHAR_T_TYPE_FIXIDX,
GLIBC_C99_INLINE_4_FIXIDX,
GLIBC_MUTEX_INIT_FIXIDX,
GLIBC_STDINT_FIXIDX,
+ GLIBC_STRNCPY_FIXIDX,
GLIBC_TGMATH_FIXIDX,
GNU_TYPES_FIXIDX,
HP_INLINE_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_STDINT_LEAST_FAST_FIXIDX,
HPUX_INTTYPE_INT8_T_FIXIDX,
HPUX_IMAGINARY_I_FIXIDX,
HUGE_VAL_HEX_FIXIDX,
IRIX___GENERIC1_FIXIDX,
IRIX___GENERIC2_FIXIDX,
IRIX_ASM_APOSTROPHE_FIXIDX,
+ IRIX_COMPLEX_FIXIDX,
IRIX_LIMITS_CONST_FIXIDX,
+ IRIX_PTHREAD_INIT_FIXIDX,
IRIX_SOCKLEN_T_FIXIDX,
- IRIX_STDINT_C99_FIXIDX,
+ IRIX_STDINT_C99_MODE_FIXIDX,
+ IRIX_STDINT_C99_TYPES_FIXIDX,
+ IRIX_STDINT_C99_MACROS_FIXIDX,
IRIX_STDIO_VA_LIST_FIXIDX,
IRIX_WCSFTIME_FIXIDX,
- ISC_FMOD_FIXIDX,
- ISC_OMITS_WITH_STDC_FIXIDX,
KANDR_CONCAT_FIXIDX,
LINUX_IA64_UCONTEXT_FIXIDX,
LYNXOS_NO_WARNING_IN_SYS_TIME_H_FIXIDX,
MATH_EXCEPTION_FIXIDX,
MATH_HUGE_VAL_FROM_DBL_MAX_FIXIDX,
NESTED_AUTH_DES_FIXIDX,
- NESTED_SYS_LIMITS_FIXIDX,
NETBSD_C99_INLINE_1_FIXIDX,
NETBSD_C99_INLINE_2_FIXIDX,
NETBSD_EXTRA_SEMICOLON_FIXIDX,
RS6000_DOUBLE_FIXIDX,
RS6000_FCHMOD_FIXIDX,
RS6000_PARAM_FIXIDX,
- SCO_MATH_FIXIDX,
+ SOLARIS___RESTRICT_FIXIDX,
+ SOLARIS_COMPLEX_FIXIDX,
+ SOLARIS_COMPLEX_CXX_FIXIDX,
+ SOLARIS_COND_INIT_FIXIDX,
SOLARIS_MATH_1_FIXIDX,
SOLARIS_MATH_2_FIXIDX,
SOLARIS_MATH_3_FIXIDX,
SOLARIS_INT_CONST_FIXIDX,
SOLARIS_INT_LIMITS_1_FIXIDX,
SOLARIS_INT_LIMITS_2_FIXIDX,
+ SOLARIS_INT_LIMITS_3_FIXIDX,
SOLARIS_INT_TYPES_FIXIDX,
SOLARIS_STDIO_TAG_FIXIDX,
+ SOLARIS_SYS_VA_LIST_FIXIDX,
STATSSWTCH_FIXIDX,
STDIO_STDARG_H_FIXIDX,
STDIO_VA_LIST_FIXIDX,
AIX_COMPLEX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aAix_ComplexTests, apzAix_ComplexPatch, 0 },
+ { zAix_Net_If_ArpName, zAix_Net_If_ArpList,
+ apzAix_Net_If_ArpMachs,
+ AIX_NET_IF_ARP_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aAix_Net_If_ArpTests, apzAix_Net_If_ArpPatch, 0 },
+
{ zAix_PthreadName, zAix_PthreadList,
apzAix_PthreadMachs,
AIX_PTHREAD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
ALPHA_SBRK_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aAlpha_SbrkTests, apzAlpha_SbrkPatch, 0 },
- { zAlpha_WcharName, zAlpha_WcharList,
- apzAlpha_WcharMachs,
- ALPHA_WCHAR_TEST_CT, FD_MACH_ONLY,
- aAlpha_WcharTests, apzAlpha_WcharPatch, 0 },
-
{ zAvoid_Bool_DefineName, zAvoid_Bool_DefineList,
apzAvoid_Bool_DefineMachs,
AVOID_BOOL_DEFINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
GLIBC_STDINT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aGlibc_StdintTests, apzGlibc_StdintPatch, 0 },
+ { zGlibc_StrncpyName, zGlibc_StrncpyList,
+ apzGlibc_StrncpyMachs,
+ GLIBC_STRNCPY_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aGlibc_StrncpyTests, apzGlibc_StrncpyPatch, 0 },
+
{ zGlibc_TgmathName, zGlibc_TgmathList,
apzGlibc_TgmathMachs,
GLIBC_TGMATH_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
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,
IRIX_ASM_APOSTROPHE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aIrix_Asm_ApostropheTests, apzIrix_Asm_ApostrophePatch, 0 },
+ { zIrix_ComplexName, zIrix_ComplexList,
+ apzIrix_ComplexMachs,
+ IRIX_COMPLEX_TEST_CT, FD_MACH_ONLY,
+ aIrix_ComplexTests, apzIrix_ComplexPatch, 0 },
+
{ zIrix_Limits_ConstName, zIrix_Limits_ConstList,
apzIrix_Limits_ConstMachs,
IRIX_LIMITS_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aIrix_Limits_ConstTests, apzIrix_Limits_ConstPatch, 0 },
+ { zIrix_Pthread_InitName, zIrix_Pthread_InitList,
+ apzIrix_Pthread_InitMachs,
+ IRIX_PTHREAD_INIT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aIrix_Pthread_InitTests, apzIrix_Pthread_InitPatch, 0 },
+
{ zIrix_Socklen_TName, zIrix_Socklen_TList,
apzIrix_Socklen_TMachs,
IRIX_SOCKLEN_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aIrix_Socklen_TTests, apzIrix_Socklen_TPatch, 0 },
- { zIrix_Stdint_C99Name, zIrix_Stdint_C99List,
- apzIrix_Stdint_C99Machs,
- IRIX_STDINT_C99_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
- aIrix_Stdint_C99Tests, apzIrix_Stdint_C99Patch, 0 },
+ { zIrix_Stdint_C99_ModeName, zIrix_Stdint_C99_ModeList,
+ apzIrix_Stdint_C99_ModeMachs,
+ IRIX_STDINT_C99_MODE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aIrix_Stdint_C99_ModeTests, apzIrix_Stdint_C99_ModePatch, 0 },
+
+ { zIrix_Stdint_C99_TypesName, zIrix_Stdint_C99_TypesList,
+ apzIrix_Stdint_C99_TypesMachs,
+ IRIX_STDINT_C99_TYPES_TEST_CT, FD_MACH_ONLY,
+ aIrix_Stdint_C99_TypesTests, apzIrix_Stdint_C99_TypesPatch, 0 },
+
+ { zIrix_Stdint_C99_MacrosName, zIrix_Stdint_C99_MacrosList,
+ apzIrix_Stdint_C99_MacrosMachs,
+ IRIX_STDINT_C99_MACROS_TEST_CT, FD_MACH_ONLY,
+ aIrix_Stdint_C99_MacrosTests, apzIrix_Stdint_C99_MacrosPatch, 0 },
{ zIrix_Stdio_Va_ListName, zIrix_Stdio_Va_ListList,
apzIrix_Stdio_Va_ListMachs,
IRIX_WCSFTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aIrix_WcsftimeTests, apzIrix_WcsftimePatch, 0 },
- { zIsc_FmodName, zIsc_FmodList,
- apzIsc_FmodMachs,
- ISC_FMOD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
- aIsc_FmodTests, apzIsc_FmodPatch, 0 },
-
- { zIsc_Omits_With_StdcName, zIsc_Omits_With_StdcList,
- apzIsc_Omits_With_StdcMachs,
- ISC_OMITS_WITH_STDC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
- aIsc_Omits_With_StdcTests, apzIsc_Omits_With_StdcPatch, 0 },
-
{ zKandr_ConcatName, zKandr_ConcatList,
apzKandr_ConcatMachs,
KANDR_CONCAT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
NESTED_AUTH_DES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aNested_Auth_DesTests, apzNested_Auth_DesPatch, 0 },
- { zNested_Sys_LimitsName, zNested_Sys_LimitsList,
- apzNested_Sys_LimitsMachs,
- NESTED_SYS_LIMITS_TEST_CT, FD_MACH_ONLY,
- aNested_Sys_LimitsTests, apzNested_Sys_LimitsPatch, 0 },
-
{ zNetbsd_C99_Inline_1Name, zNetbsd_C99_Inline_1List,
apzNetbsd_C99_Inline_1Machs,
NETBSD_C99_INLINE_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
RS6000_PARAM_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aRs6000_ParamTests, apzRs6000_ParamPatch, 0 },
- { zSco_MathName, zSco_MathList,
- apzSco_MathMachs,
- SCO_MATH_TEST_CT, FD_MACH_ONLY,
- aSco_MathTests, apzSco_MathPatch, 0 },
+ { zSolaris___RestrictName, zSolaris___RestrictList,
+ apzSolaris___RestrictMachs,
+ SOLARIS___RESTRICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aSolaris___RestrictTests, apzSolaris___RestrictPatch, 0 },
+
+ { zSolaris_ComplexName, zSolaris_ComplexList,
+ apzSolaris_ComplexMachs,
+ SOLARIS_COMPLEX_TEST_CT, FD_MACH_ONLY,
+ aSolaris_ComplexTests, apzSolaris_ComplexPatch, 0 },
+
+ { zSolaris_Complex_CxxName, zSolaris_Complex_CxxList,
+ apzSolaris_Complex_CxxMachs,
+ SOLARIS_COMPLEX_CXX_TEST_CT, FD_MACH_ONLY,
+ aSolaris_Complex_CxxTests, apzSolaris_Complex_CxxPatch, 0 },
+
+ { zSolaris_Cond_InitName, zSolaris_Cond_InitList,
+ apzSolaris_Cond_InitMachs,
+ SOLARIS_COND_INIT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aSolaris_Cond_InitTests, apzSolaris_Cond_InitPatch, 0 },
{ zSolaris_Math_1Name, zSolaris_Math_1List,
apzSolaris_Math_1Machs,
SOLARIS_INT_LIMITS_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aSolaris_Int_Limits_2Tests, apzSolaris_Int_Limits_2Patch, 0 },
+ { zSolaris_Int_Limits_3Name, zSolaris_Int_Limits_3List,
+ apzSolaris_Int_Limits_3Machs,
+ SOLARIS_INT_LIMITS_3_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aSolaris_Int_Limits_3Tests, apzSolaris_Int_Limits_3Patch, 0 },
+
{ zSolaris_Int_TypesName, zSolaris_Int_TypesList,
apzSolaris_Int_TypesMachs,
SOLARIS_INT_TYPES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
SOLARIS_STDIO_TAG_TEST_CT, FD_MACH_ONLY,
aSolaris_Stdio_TagTests, apzSolaris_Stdio_TagPatch, 0 },
+ { zSolaris_Sys_Va_ListName, zSolaris_Sys_Va_ListList,
+ apzSolaris_Sys_Va_ListMachs,
+ SOLARIS_SYS_VA_LIST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aSolaris_Sys_Va_ListTests, apzSolaris_Sys_Va_ListPatch, 0 },
+
{ zStatsswtchName, zStatsswtchList,
apzStatsswtchMachs,
STATSSWTCH_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,