From 7f1db1443f129437b19f9fe3b34dbb41bc60ef96 Mon Sep 17 00:00:00 2001 From: Yijia Zhang Date: Wed, 14 Aug 2024 14:40:22 -0700 Subject: [PATCH] Resolve merge conflict by incorporating both changes. Change-Id: I3997980765d594afdea3a3c140132c20422ce349 --- starboard/shared/win32/file_open.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/starboard/shared/win32/file_open.cc b/starboard/shared/win32/file_open.cc index be8459b9921d..d632c234a363 100644 --- a/starboard/shared/win32/file_open.cc +++ b/starboard/shared/win32/file_open.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 16 +#if SB_API_VERSION < 17 #include "starboard/file.h" @@ -42,4 +42,4 @@ SbFile SbFileOpen(const char* path, return new SbFilePrivate(file_handle); } -#endif // SB_API_VERSION < 16 +#endif // SB_API_VERSION < 17