Remove cpp_magic.h import and ancient Clang compatibility hack from…

… `CNIOAtomics.h` (#1111) The inclusion of `cpp_magic.h` in `CNIOAtomics.h` is unnecessary and pollutes the namespace of anyone else importing the header. NIO now also requires Swift 5, which itself will not be built with a Clang too old to understand `_Nonnull`. Note: Removing the extra import of cpp-magic.h required moving it to the src/ directory to avoid complaints about its inclusion (or lack thereof) in the module's umbrella header.
apple · Aug 15, 2019 · 7908278 · 7908278
1 parent 415b48e
commit 7908278
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 8 deletions.
diff --git a/Sources/CNIOAtomics/include/CNIOAtomics.h b/Sources/CNIOAtomics/include/CNIOAtomics.h
@@ -15,13 +15,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "cpp_magic.h"
-
-#if __clang_major__ == 3 && __clang_minor__ <= 6
-/* clang 3.6 doesn't seem to know about _Nonnull yet */
-#define _Nonnull __attribute__((nonnull))
-#endif
-
 struct catmc_atomic__Bool;
 struct catmc_atomic__Bool * _Nonnull catmc_atomic__Bool_create(bool value);
 void catmc_atomic__Bool_destroy(struct catmc_atomic__Bool * _Nonnull atomic);

diff --git a/Sources/CNIOAtomics/src/c-atomics.c b/Sources/CNIOAtomics/src/c-atomics.c
@@ -19,7 +19,7 @@
 #include <stdio.h>
 
 #include "../include/CNIOAtomics.h"
-#include "../include/cpp_magic.h"
+#include "cpp_magic.h"
 
 #define MAKE(type) /*
 */ struct catmc_atomic_##type { /*

diff --git a/Sources/CNIOAtomics/include/cpp_magic.h → Sources/CNIOAtomics/src/cpp_magic.h b/Sources/CNIOAtomics/include/cpp_magic.h → Sources/CNIOAtomics/src/cpp_magic.h