mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'loaden-apple-fix' into hotfix-1.7.2

Browse Source
This commit is contained in:
Jinhao 2019-09-01 23:09:44 +08:00
commit cdc7067659
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/nana/c++defines.hpp
View File

@ -89,7 +89,7 @@
#define NANA_MINGW #define NANA_MINGW
#endif // MINGW #endif // MINGW
#elif defined(APPLE) //Mac OS X #elif defined(__APPLE__) || defined(APPLE) //Mac OS X
//Symbols for MACOS //Symbols for MACOS
#define NANA_MACOS #define NANA_MACOS
#define NANA_POSIX #define NANA_POSIX
@ -252,7 +252,7 @@
# if __has_include(<filesystem>) # if __has_include(<filesystem>)
# undef STD_FILESYSTEM_NOT_SUPPORTED # undef STD_FILESYSTEM_NOT_SUPPORTED
# endif # endif
# if __has_include(<mutex>) # if __has_include(<mutex>)
# if !(defined(NANA_MINGW) && !defined(_GLIBCXX_HAS_GTHREADS)) # if !(defined(NANA_MINGW) && !defined(_GLIBCXX_HAS_GTHREADS))
//See the comment above regarding MinGW's threading support //See the comment above regarding MinGW's threading support
# undef STD_THREAD_NOT_SUPPORTED # undef STD_THREAD_NOT_SUPPORTED