*
* DO NOT EDIT THIS FILE (fixincl.x)
*
- * It has been AutoGen-ed Monday August 22, 2011 at 05:03:34 PM PDT
+ * It has been AutoGen-ed March 26, 2012 at 10:53:21 AM by AutoGen 5.10
* From the definitions inclhack.def
* and the template file fixincl
*/
-/* DO NOT SVN-MERGE THIS FILE, EITHER Mon Aug 22 17:03:34 PDT 2011
+/* DO NOT SVN-MERGE THIS FILE, EITHER Mon Mar 26 10:53:21 EDT 2012
*
* 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 217 fixup descriptions.
+ * This file contains 224 fixup descriptions.
*
* See README for more information.
*
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Aix_Malloc fix
+ */
+tSCC zAix_MallocName[] =
+ "aix_malloc";
+
+/*
+ * File name selection pattern
+ */
+tSCC zAix_MallocList[] =
+ "malloc.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzAix_MallocMachs[] = {
+ "*-*-aix*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zAix_MallocSelect0[] =
+ "#ifdef __cplusplus";
+
+#define AIX_MALLOC_TEST_CT 1
+static tTestDesc aAix_MallocTests[] = {
+ { TT_EGREP, zAix_MallocSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Aix_Malloc
+ */
+static const char* apzAix_MallocPatch[] = {
+ "format",
+ "#if (defined(__cplusplus) && defined(__IBMCPP__))",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Aix_Net_If_Arp fix
*/
tSCC zAix_Net_If_ArpName[] =
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Aix_Once_Init_1 fix
+ */
+tSCC zAix_Once_Init_1Name[] =
+ "aix_once_init_1";
+
+/*
+ * File name selection pattern
+ */
+tSCC zAix_Once_Init_1List[] =
+ "pthread.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzAix_Once_Init_1Machs[] = {
+ "*-*-aix*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zAix_Once_Init_1Select0[] =
+ "#define[ \t]PTHREAD_ONCE_INIT \\\\\n\
+\\{ \\\\\n";
+
+#define AIX_ONCE_INIT_1_TEST_CT 1
+static tTestDesc aAix_Once_Init_1Tests[] = {
+ { TT_EGREP, zAix_Once_Init_1Select0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Aix_Once_Init_1
+ */
+static const char* apzAix_Once_Init_1Patch[] = {
+ "format",
+ "#define PTHREAD_ONCE_INIT \\\n\
+{{ \\\n",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Aix_Once_Init_2 fix
+ */
+tSCC zAix_Once_Init_2Name[] =
+ "aix_once_init_2";
+
+/*
+ * File name selection pattern
+ */
+tSCC zAix_Once_Init_2List[] =
+ "pthread.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzAix_Once_Init_2Machs[] = {
+ "*-*-aix*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zAix_Once_Init_2Select0[] =
+ "[ \t]0 \\\\\n\
+\\}\n";
+
+#define AIX_ONCE_INIT_2_TEST_CT 1
+static tTestDesc aAix_Once_Init_2Tests[] = {
+ { TT_EGREP, zAix_Once_Init_2Select0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Aix_Once_Init_2
+ */
+static const char* apzAix_Once_Init_2Patch[] = {
+ "format",
+ "\t0 \\\n\
+}}\n",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Aix_Pthread fix
*/
tSCC zAix_PthreadName[] =
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Cdef_Cplusplus fix
+ */
+tSCC zCdef_CplusplusName[] =
+ "cdef_cplusplus";
+
+/*
+ * File name selection pattern
+ */
+tSCC zCdef_CplusplusList[] =
+ "sys/cdefs.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+#define apzCdef_CplusplusMachs (const char**)NULL
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zCdef_CplusplusSelect0[] =
+ "\\[\\[noreturn\\]\\]";
+
+#define CDEF_CPLUSPLUS_TEST_CT 1
+static tTestDesc aCdef_CplusplusTests[] = {
+ { TT_EGREP, zCdef_CplusplusSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Cdef_Cplusplus
+ */
+static const char* apzCdef_CplusplusPatch[] = {
+ "format",
+ "__attribute__((__noreturn__))",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Ctrl_Quotes_Def fix
*/
tSCC zCtrl_Quotes_DefName[] =
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Vms_Define_Can_Use_Extern_Prefix fix
+ */
+tSCC zVms_Define_Can_Use_Extern_PrefixName[] =
+ "vms_define_can_use_extern_prefix";
+
+/*
+ * File name selection pattern
+ */
+tSCC zVms_Define_Can_Use_Extern_PrefixList[] =
+ "rtldef/decc$types.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzVms_Define_Can_Use_Extern_PrefixMachs[] = {
+ "*-*-*vms*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zVms_Define_Can_Use_Extern_PrefixSelect0[] =
+ "#[ \t]*else\n\
+#[ \t]*if defined\\(__DECCXX\\)\n\
+#[ \t]*define __CAN_USE_EXTERN_PREFIX 1\n";
+
+#define VMS_DEFINE_CAN_USE_EXTERN_PREFIX_TEST_CT 1
+static tTestDesc aVms_Define_Can_Use_Extern_PrefixTests[] = {
+ { TT_EGREP, zVms_Define_Can_Use_Extern_PrefixSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Vms_Define_Can_Use_Extern_Prefix
+ */
+static const char* apzVms_Define_Can_Use_Extern_PrefixPatch[] = {
+ "format",
+ "%0# elif defined (__GNUC__)\n\
+#\tdefine __CAN_USE_EXTERN_PREFIX 1\n",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Vms_Use_Pragma_Extern_Model fix
+ */
+tSCC zVms_Use_Pragma_Extern_ModelName[] =
+ "vms_use_pragma_extern_model";
+
+/*
+ * File name selection pattern
+ */
+#define zVms_Use_Pragma_Extern_ModelList (char*)NULL
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzVms_Use_Pragma_Extern_ModelMachs[] = {
+ "*-*-*vms*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zVms_Use_Pragma_Extern_ModelSelect0[] =
+ "#if defined\\(__DECC\\) \\|\\| defined\\(__DECCXX\\)\n\
+# pragma extern_model __save\n";
+
+#define VMS_USE_PRAGMA_EXTERN_MODEL_TEST_CT 1
+static tTestDesc aVms_Use_Pragma_Extern_ModelTests[] = {
+ { TT_EGREP, zVms_Use_Pragma_Extern_ModelSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Vms_Use_Pragma_Extern_Model
+ */
+static const char* apzVms_Use_Pragma_Extern_ModelPatch[] = {
+ "format",
+ "#if defined(__DECC) || defined(__DECCXX) || defined(__GNUC__)\n\
+# pragma extern_model __save\n",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Vms_Disable_Decc_String_Builtins fix
+ */
+tSCC zVms_Disable_Decc_String_BuiltinsName[] =
+ "vms_disable_decc_string_builtins";
+
+/*
+ * File name selection pattern
+ */
+tSCC zVms_Disable_Decc_String_BuiltinsList[] =
+ "rtldef/string.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzVms_Disable_Decc_String_BuiltinsMachs[] = {
+ "*-*-*vms*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zVms_Disable_Decc_String_BuiltinsSelect0[] =
+ "#if !defined\\(__VAX\\)\n";
+
+#define VMS_DISABLE_DECC_STRING_BUILTINS_TEST_CT 1
+static tTestDesc aVms_Disable_Decc_String_BuiltinsTests[] = {
+ { TT_EGREP, zVms_Disable_Decc_String_BuiltinsSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Vms_Disable_Decc_String_Builtins
+ */
+static const char* apzVms_Disable_Decc_String_BuiltinsPatch[] = {
+ "format",
+ "#if !defined(__VAX) && !defined(__GNUC__)\n",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Void_Null fix
*/
tSCC zVoid_NullName[] =
*/
tSCC zVoid_NullBypass0[] =
"__cplusplus";
+tSCC zVoid_NullBypass1[] =
+ "__null";
-#define VOID_NULL_TEST_CT 2
+#define VOID_NULL_TEST_CT 3
static tTestDesc aVoid_NullTests[] = {
{ TT_NEGREP, zVoid_NullBypass0, (regex_t*)NULL },
+ { TT_NEGREP, zVoid_NullBypass1, (regex_t*)NULL },
{ TT_EGREP, zVoid_NullSelect0, (regex_t*)NULL }, };
/*
*
* List of all fixes
*/
-#define REGEX_COUNT 258
+#define REGEX_COUNT 266
#define MACH_LIST_SIZE_LIMIT 181
-#define FIX_COUNT 217
+#define FIX_COUNT 224
/*
* Enumerate the fixes
AAB_SOLARIS_SYS_VARARGS_H_FIXIDX,
AAB_SUN_MEMCPY_FIXIDX,
AIX_COMPLEX_FIXIDX,
+ AIX_MALLOC_FIXIDX,
AIX_NET_IF_ARP_FIXIDX,
+ AIX_ONCE_INIT_1_FIXIDX,
+ AIX_ONCE_INIT_2_FIXIDX,
AIX_PTHREAD_FIXIDX,
AIX_STDINT_1_FIXIDX,
AIX_STDINT_2_FIXIDX,
BROKEN_CABS_FIXIDX,
BROKEN_NAN_FIXIDX,
BSD_STDIO_ATTRS_CONFLICT_FIXIDX,
+ CDEF_CPLUSPLUS_FIXIDX,
CTRL_QUOTES_DEF_FIXIDX,
CTRL_QUOTES_USE_FIXIDX,
CXX_UNREADY_FIXIDX,
ULTRIX_CONST_FIXIDX,
ULTRIX_CONST2_FIXIDX,
VA_I960_MACRO_FIXIDX,
+ VMS_DEFINE_CAN_USE_EXTERN_PREFIX_FIXIDX,
+ VMS_USE_PRAGMA_EXTERN_MODEL_FIXIDX,
+ VMS_DISABLE_DECC_STRING_BUILTINS_FIXIDX,
VOID_NULL_FIXIDX,
VXWORKS_GCC_PROBLEM_FIXIDX,
VXWORKS_NEEDS_VXTYPES_FIXIDX,
AIX_COMPLEX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aAix_ComplexTests, apzAix_ComplexPatch, 0 },
+ { zAix_MallocName, zAix_MallocList,
+ apzAix_MallocMachs,
+ AIX_MALLOC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aAix_MallocTests, apzAix_MallocPatch, 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_Once_Init_1Name, zAix_Once_Init_1List,
+ apzAix_Once_Init_1Machs,
+ AIX_ONCE_INIT_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aAix_Once_Init_1Tests, apzAix_Once_Init_1Patch, 0 },
+
+ { zAix_Once_Init_2Name, zAix_Once_Init_2List,
+ apzAix_Once_Init_2Machs,
+ AIX_ONCE_INIT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aAix_Once_Init_2Tests, apzAix_Once_Init_2Patch, 0 },
+
{ zAix_PthreadName, zAix_PthreadList,
apzAix_PthreadMachs,
AIX_PTHREAD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
BSD_STDIO_ATTRS_CONFLICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aBsd_Stdio_Attrs_ConflictTests, apzBsd_Stdio_Attrs_ConflictPatch, 0 },
+ { zCdef_CplusplusName, zCdef_CplusplusList,
+ apzCdef_CplusplusMachs,
+ CDEF_CPLUSPLUS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aCdef_CplusplusTests, apzCdef_CplusplusPatch, 0 },
+
{ zCtrl_Quotes_DefName, zCtrl_Quotes_DefList,
apzCtrl_Quotes_DefMachs,
CTRL_QUOTES_DEF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
VA_I960_MACRO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aVa_I960_MacroTests, apzVa_I960_MacroPatch, 0 },
+ { zVms_Define_Can_Use_Extern_PrefixName, zVms_Define_Can_Use_Extern_PrefixList,
+ apzVms_Define_Can_Use_Extern_PrefixMachs,
+ VMS_DEFINE_CAN_USE_EXTERN_PREFIX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aVms_Define_Can_Use_Extern_PrefixTests, apzVms_Define_Can_Use_Extern_PrefixPatch, 0 },
+
+ { zVms_Use_Pragma_Extern_ModelName, zVms_Use_Pragma_Extern_ModelList,
+ apzVms_Use_Pragma_Extern_ModelMachs,
+ VMS_USE_PRAGMA_EXTERN_MODEL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aVms_Use_Pragma_Extern_ModelTests, apzVms_Use_Pragma_Extern_ModelPatch, 0 },
+
+ { zVms_Disable_Decc_String_BuiltinsName, zVms_Disable_Decc_String_BuiltinsList,
+ apzVms_Disable_Decc_String_BuiltinsMachs,
+ VMS_DISABLE_DECC_STRING_BUILTINS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aVms_Disable_Decc_String_BuiltinsTests, apzVms_Disable_Decc_String_BuiltinsPatch, 0 },
+
{ zVoid_NullName, zVoid_NullList,
apzVoid_NullMachs,
VOID_NULL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,