Merge branch 'master' into modernize

SpartanJ · May 22, 2024 · eef303a · eef303a
2 parents 24235a2 + 36c1c70
commit eef303a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -92,10 +92,6 @@ if(APPLE)
 		src/efsw/WatcherFSEvents.cpp
 		src/efsw/WatcherKqueue.cpp
 	)
-
-	if(NOT CMAKE_SYSTEM_VERSION GREATER 9)
-		target_compile_definitions(efsw PRIVATE EFSW_FSEVENTS_NOT_SUPPORTED)
-	endif()
 elseif(WIN32)
 	list(APPEND EFSW_CPP_SOURCE
 		src/efsw/FileWatcherWin32.cpp
@@ -117,7 +113,8 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
 	)
 endif()
 
-if(MSVC)
+if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" OR
+	(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC"))
 	target_compile_definitions(efsw PRIVATE _SCL_SECURE_NO_WARNINGS)
 else()
 	target_compile_options(efsw PRIVATE -Wall -Wno-long-long -fPIC)

diff --git a/src/efsw/FileSystem.cpp b/src/efsw/FileSystem.cpp
@@ -1,6 +1,6 @@
+#include <cstring>
 #include <efsw/FileSystem.hpp>
 #include <efsw/platform/platformimpl.hpp>
-#include <cstring>
 
 #if EFSW_OS == EFSW_OS_MACOSX
 #include <CoreFoundation/CoreFoundation.h>
@@ -107,7 +107,7 @@ std::string FileSystem::precomposeFileName( const std::string& name ) {
 		return std::string();
 	}
 
-	std::string result( maxSize, '\0' );
+	std::string result( maxSize + 1, '\0' );
 	if ( CFStringGetCString( cfMutable, &result[0], result.size(), kCFStringEncodingUTF8 ) ) {
 		result.resize( std::strlen( result.c_str() ) );
 		CFRelease( cfStringRef );