Skip to content

Commit

Permalink
Fix C25 xbox build failure on SbFileOpen. (youtube#3982)
Browse files Browse the repository at this point in the history
b/302715109

(cherry picked from commit d4f1e95)
  • Loading branch information
yjzhang111 authored and anonymous1-me committed Aug 14, 2024
1 parent 1ce5a18 commit f55f685
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions starboard/shared/win32/file_open.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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))

0 comments on commit f55f685

Please sign in to comment.