mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
139 lines
4.1 KiB
Diff
139 lines
4.1 KiB
Diff
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
|
|
index ad5824d..e36abe8 100644
|
|
--- fixincludes/fixincl.x.orig
|
|
+++ fixincludes/fixincl.x
|
|
@@ -2,11 +2,11 @@
|
|
*
|
|
* DO NOT EDIT THIS FILE (fixincl.x)
|
|
*
|
|
- * It has been AutoGen-ed December 21, 2017 at 02:34:35 PM by AutoGen 5.18.7
|
|
+ * It has been AutoGen-ed April 16, 2019 at 09:32:25 AM by AutoGen 5.17.4
|
|
* From the definitions inclhack.def
|
|
* and the template file fixincl
|
|
*/
|
|
-/* DO NOT SVN-MERGE THIS FILE, EITHER Thu Dec 21 14:34:35 CET 2017
|
|
+/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Apr 16 09:32:25 IST 2019
|
|
*
|
|
* You must regenerate it. Use the ./genfixes script.
|
|
*
|
|
@@ -15,7 +15,7 @@
|
|
* 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 241 fixup descriptions.
|
|
+ * This file contains 242 fixup descriptions.
|
|
*
|
|
* See README for more information.
|
|
*
|
|
@@ -3092,6 +3092,48 @@
|
|
|
|
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
|
*
|
|
+ * Description of Darwin_Ucred__Atomic fix
|
|
+ */
|
|
+tSCC zDarwin_Ucred__AtomicName[] =
|
|
+ "darwin_ucred__Atomic";
|
|
+
|
|
+/*
|
|
+ * File name selection pattern
|
|
+ */
|
|
+tSCC zDarwin_Ucred__AtomicList[] =
|
|
+ "sys/ucred.h\0";
|
|
+/*
|
|
+ * Machine/OS name selection pattern
|
|
+ */
|
|
+tSCC* apzDarwin_Ucred__AtomicMachs[] = {
|
|
+ "*-*-darwin*",
|
|
+ (const char*)NULL };
|
|
+
|
|
+/*
|
|
+ * content selection pattern - do fix if pattern found
|
|
+ */
|
|
+tSCC zDarwin_Ucred__AtomicSelect0[] =
|
|
+ "_Atomic";
|
|
+
|
|
+#define DARWIN_UCRED__ATOMIC_TEST_CT 1
|
|
+static tTestDesc aDarwin_Ucred__AtomicTests[] = {
|
|
+ { TT_EGREP, zDarwin_Ucred__AtomicSelect0, (regex_t*)NULL }, };
|
|
+
|
|
+/*
|
|
+ * Fix Command Arguments for Darwin_Ucred__Atomic
|
|
+ */
|
|
+static const char* apzDarwin_Ucred__AtomicPatch[] = {
|
|
+ "wrap",
|
|
+ "#if (__STDC_VERSION__ < 201112L) || defined(__cplusplus)\n\
|
|
+# define _Atomic volatile\n\
|
|
+#endif\n",
|
|
+ "#if (__STDC_VERSION__ < 201112L) || defined(__cplusplus)\n\
|
|
+# undef _Atomic\n\
|
|
+#endif\n",
|
|
+ (char*)NULL };
|
|
+
|
|
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
|
+ *
|
|
* Description of Dec_Intern_Asm fix
|
|
*/
|
|
tSCC zDec_Intern_AsmName[] =
|
|
@@ -9855,9 +9897,9 @@
|
|
*
|
|
* List of all fixes
|
|
*/
|
|
-#define REGEX_COUNT 277
|
|
+#define REGEX_COUNT 278
|
|
#define MACH_LIST_SIZE_LIMIT 187
|
|
-#define FIX_COUNT 241
|
|
+#define FIX_COUNT 242
|
|
|
|
/*
|
|
* Enumerate the fixes
|
|
@@ -9934,6 +9976,7 @@
|
|
DARWIN_STDINT_5_FIXIDX,
|
|
DARWIN_STDINT_6_FIXIDX,
|
|
DARWIN_STDINT_7_FIXIDX,
|
|
+ DARWIN_UCRED__ATOMIC_FIXIDX,
|
|
DEC_INTERN_ASM_FIXIDX,
|
|
DJGPP_WCHAR_H_FIXIDX,
|
|
ECD_CURSOR_FIXIDX,
|
|
@@ -10462,6 +10505,11 @@
|
|
DARWIN_STDINT_7_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
|
|
aDarwin_Stdint_7Tests, apzDarwin_Stdint_7Patch, 0 },
|
|
|
|
+ { zDarwin_Ucred__AtomicName, zDarwin_Ucred__AtomicList,
|
|
+ apzDarwin_Ucred__AtomicMachs,
|
|
+ DARWIN_UCRED__ATOMIC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
|
|
+ aDarwin_Ucred__AtomicTests, apzDarwin_Ucred__AtomicPatch, 0 },
|
|
+
|
|
{ zDec_Intern_AsmName, zDec_Intern_AsmList,
|
|
apzDec_Intern_AsmMachs,
|
|
DEC_INTERN_ASM_TEST_CT, FD_MACH_ONLY,
|
|
diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
|
|
index 8fd9f7e..98f1654 100644
|
|
--- fixincludes/inclhack.def.orig
|
|
+++ fixincludes/inclhack.def
|
|
@@ -1603,6 +1603,25 @@
|
|
"#define UINTMAX_C(v) (v ## ULL)";
|
|
};
|
|
|
|
+/* The SDK included with XCode 10.2 has the file <sys/ucred.h> that uses the
|
|
+ C11 _Atomic keyword (exposing it to C++ code). The work-around here follows
|
|
+ the header in declaring the entity volatile when _Atomic is not available.
|
|
+*/
|
|
+fix = {
|
|
+ hackname = darwin_ucred__Atomic;
|
|
+ mach = "*-*-darwin*";
|
|
+ files = sys/ucred.h;
|
|
+ select = "_Atomic";
|
|
+ c_fix = wrap;
|
|
+ c_fix_arg = "#if (__STDC_VERSION__ < 201112L) || defined(__cplusplus)\n"
|
|
+ "# define _Atomic volatile\n"
|
|
+ "#endif\n";
|
|
+ c_fix_arg = "#if (__STDC_VERSION__ < 201112L) || defined(__cplusplus)\n"
|
|
+ "# undef _Atomic\n"
|
|
+ "#endif\n";
|
|
+ test_text = "_Atomic";
|
|
+};
|
|
+
|
|
/*
|
|
* Fix <c_asm.h> on Digital UNIX V4.0:
|
|
* It contains a prototype for a DEC C internal asm() function,
|