diff options
| author | bunnei <bunneidev@gmail.com> | 2016-12-16 00:40:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-16 00:40:40 -0500 |
| commit | a89471621b3b156300700f29ebed601da9b582a5 (patch) | |
| tree | 98d47d481d24566575c88d40836123e899782975 /src/common/file_util.cpp | |
| parent | 2427a5e9768b6b4c7d15df1007753e3cdbec37d1 (diff) | |
| parent | fb952c399e1ba5435e8f76a34f609be5fd64f4eb (diff) | |
Merge pull request #2316 from endrift/macos-gcc
Common: Fix gcc build on macOS
Diffstat (limited to 'src/common/file_util.cpp')
| -rw-r--r-- | src/common/file_util.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp index b6161f2dc..c618495f7 100644 --- a/src/common/file_util.cpp +++ b/src/common/file_util.cpp @@ -40,9 +40,20 @@ #endif #if defined(__APPLE__) +// CFURL contains __attribute__ directives that gcc does not know how to parse, so we need to just +// ignore them if we're not using clang. The macro is only used to prevent linking against +// functions that don't exist on older versions of macOS, and the worst case scenario is a linker +// error, so this is perfectly safe, just inconvenient. +#ifndef __clang__ +#define availability(...) +#endif #include <CoreFoundation/CFBundle.h> #include <CoreFoundation/CFString.h> #include <CoreFoundation/CFURL.h> +#ifdef availability +#undef availability +#endif + #endif #include <algorithm> |