diff --git a/app_config.h b/app_config.h new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/app_config.h @@ -0,0 +1 @@ + diff --git a/include/zep/editor.h b/include/zep/editor.h index 99347627..5bee5e6d 100644 --- a/include/zep/editor.h +++ b/include/zep/editor.h @@ -436,7 +436,7 @@ class ZepEditor tBuffers m_buffers; uint32_t m_flags = 0; - mutable std::atomic_bool m_bPendingRefresh = true; + mutable std::atomic_bool m_bPendingRefresh = { true }; mutable bool m_lastCursorBlink = false; std::vector m_commandLines; // Command information, shown under the buffer diff --git a/src/filesystem.cpp b/src/filesystem.cpp index 6a1d7479..fdc1c293 100644 --- a/src/filesystem.cpp +++ b/src/filesystem.cpp @@ -11,7 +11,12 @@ #if defined(ZEP_FEATURE_CPP_FILE_SYSTEM) #include -namespace cpp_fs = std::filesystem; + +#ifdef __APPLE__ + namespace cpp_fs = std::__fs::filesystem; +#else + namespace cpp_fs = std::filesystem; +#endif namespace Zep {