From f55f685426b0096f1a68d934f89a3767638650a2 Mon Sep 17 00:00:00 2001
From: Yijia Zhang <45114178+yjzhang111@users.noreply.github.com>
Date: Wed, 14 Aug 2024 10:00:26 -0700
Subject: [PATCH 1/2] Fix C25 xbox build failure on SbFileOpen. (#3982)

b/302715109

(cherry picked from commit d4f1e954b1b997f65e4badde6685eb103f8e22d0)
---
 starboard/shared/win32/file_open.cc | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/starboard/shared/win32/file_open.cc b/starboard/shared/win32/file_open.cc
index 2aa61824e32d..372d3e500b71 100644
--- a/starboard/shared/win32/file_open.cc
+++ b/starboard/shared/win32/file_open.cc
@@ -12,6 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+<<<<<<< HEAD
+=======
+#if SB_API_VERSION < 17
+
+>>>>>>> d4f1e954b1b (Fix C25 xbox build failure on SbFileOpen. (#3982))
 #include "starboard/file.h"
 
 #include "starboard/shared/win32/file_internal.h"
@@ -39,3 +44,8 @@ SbFile SbFileOpen(const char* path,
 
   return new SbFilePrivate(file_handle);
 }
+<<<<<<< HEAD
+=======
+
+#endif  // SB_API_VERSION < 17
+>>>>>>> d4f1e954b1b (Fix C25 xbox build failure on SbFileOpen. (#3982))

From eca8880da1a44b55f6edd39b424a300fc3b6c46a Mon Sep 17 00:00:00 2001
From: Yijia Zhang <45114178+yjzhang111@users.noreply.github.com>
Date: Wed, 14 Aug 2024 10:43:35 -0700
Subject: [PATCH 2/2] Remove merge conflict.

---
 starboard/shared/win32/file_open.cc | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/starboard/shared/win32/file_open.cc b/starboard/shared/win32/file_open.cc
index 372d3e500b71..d632c234a363 100644
--- a/starboard/shared/win32/file_open.cc
+++ b/starboard/shared/win32/file_open.cc
@@ -12,11 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-<<<<<<< HEAD
-=======
 #if SB_API_VERSION < 17
 
->>>>>>> d4f1e954b1b (Fix C25 xbox build failure on SbFileOpen. (#3982))
 #include "starboard/file.h"
 
 #include "starboard/shared/win32/file_internal.h"
@@ -44,8 +41,5 @@ SbFile SbFileOpen(const char* path,
 
   return new SbFilePrivate(file_handle);
 }
-<<<<<<< HEAD
-=======
 
 #endif  // SB_API_VERSION < 17
->>>>>>> d4f1e954b1b (Fix C25 xbox build failure on SbFileOpen. (#3982))