From 3b690d1fc95557860799a4d6597d929752dc5a74 Mon Sep 17 00:00:00 2001
From: Josh Ferrell <josh@vector35.com>
Date: Tue, 30 Jan 2024 20:08:15 -0500
Subject: Avoid windows CreateFile conflict

---
 binaryninjaapi.h  | 2 +-
 binaryninjacore.h | 4 ++--
 project.cpp       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/binaryninjaapi.h b/binaryninjaapi.h
index 79295b6e..e3a5ec4d 100644
--- a/binaryninjaapi.h
+++ b/binaryninjaapi.h
@@ -2677,7 +2677,7 @@ namespace BinaryNinja {
 
 		Ref<ProjectFile> CreateFileFromPath(const std::string& path, Ref<ProjectFolder> folder, const std::string& name, const std::string& description, const std::function<bool(size_t progress, size_t total)>& progressCallback = {});
 		Ref<ProjectFile> CreateFileFromPathUnsafe(const std::string& path, Ref<ProjectFolder> folder, const std::string& name, const std::string& description, const std::string& id, int64_t creationTimestamp, const std::function<bool(size_t progress, size_t total)>& progressCallback = {});
-		Ref<ProjectFile> CreateFile(const std::vector<uint8_t>& contents, Ref<ProjectFolder> folder, const std::string& name, const std::string& description, const std::function<bool(size_t progress, size_t total)>& progressCallback = {});
+		Ref<ProjectFile> CreateFile_(const std::vector<uint8_t>& contents, Ref<ProjectFolder> folder, const std::string& name, const std::string& description, const std::function<bool(size_t progress, size_t total)>& progressCallback = {});
 		Ref<ProjectFile> CreateFileUnsafe(const std::vector<uint8_t>& contents, Ref<ProjectFolder> folder, const std::string& name, const std::string& description, const std::string& id, int64_t creationTimestamp, const std::function<bool(size_t progress, size_t total)>& progressCallback = {});
 		std::vector<Ref<ProjectFile>> GetFiles() const;
 		Ref<ProjectFile> GetFileById(const std::string& id) const;
diff --git a/binaryninjacore.h b/binaryninjacore.h
index 0dbec72e..29d1cf29 100644
--- a/binaryninjacore.h
+++ b/binaryninjacore.h
@@ -37,14 +37,14 @@
 // Current ABI version for linking to the core. This is incremented any time
 // there are changes to the API that affect linking, including new functions,
 // new types, or modifications to existing functions or types.
-#define BN_CURRENT_CORE_ABI_VERSION 48
+#define BN_CURRENT_CORE_ABI_VERSION 49
 
 // Minimum ABI version that is supported for loading of plugins. Plugins that
 // are linked to an ABI version less than this will not be able to load and
 // will require rebuilding. The minimum version is increased when there are
 // incompatible changes that break binary compatibility, such as changes to
 // existing types or functions.
-#define BN_MINIMUM_CORE_ABI_VERSION 47
+#define BN_MINIMUM_CORE_ABI_VERSION 49
 
 #ifdef __GNUC__
 	#ifdef BINARYNINJACORE_LIBRARY
diff --git a/project.cpp b/project.cpp
index f6e6b49c..018b6e14 100644
--- a/project.cpp
+++ b/project.cpp
@@ -429,7 +429,7 @@ Ref<ProjectFile> Project::CreateFileFromPathUnsafe(const std::string& path, Ref<
 }
 
 
-Ref<ProjectFile> Project::CreateFile(const std::vector<uint8_t>& contents, Ref<ProjectFolder> folder, const std::string& name, const std::string& description, const std::function<bool(size_t progress, size_t total)>& progressCallback)
+Ref<ProjectFile> Project::CreateFile_(const std::vector<uint8_t>& contents, Ref<ProjectFolder> folder, const std::string& name, const std::string& description, const std::function<bool(size_t progress, size_t total)>& progressCallback)
 {
 	ProgressContext cb;
 	cb.callback = progressCallback;
-- 
cgit v1.3.1