franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2316 from endrift/macos-gcc 

Common: Fix gcc build on macOS
This commit is contained in:
bunnei 2016-12-16 00:40:40 -05:00 committed by GitHub
parent 2427a5e976 fb952c399e
commit a89471621b
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/file_util.cpp
View File

@ -40,9 +40,20 @@
#endif #endif
#if defined(__APPLE__) #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/CFBundle.h>
#include <CoreFoundation/CFString.h> #include <CoreFoundation/CFString.h>
#include <CoreFoundation/CFURL.h> #include <CoreFoundation/CFURL.h>
#ifdef availability
#undef availability
#endif
#endif #endif
#include <algorithm> #include <algorithm>