diff --git a/starboard/android/shared/file_can_open.cc b/starboard/android/shared/file_can_open.cc index db7155fe3d2f..5aeb5fd1ed00 100644 --- a/starboard/android/shared/file_can_open.cc +++ b/starboard/android/shared/file_can_open.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/file.h" #include @@ -43,5 +41,3 @@ bool SbFileCanOpen(const char* path, int flags) { return result; } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/android/shared/file_close.cc b/starboard/android/shared/file_close.cc index b44eeca4ae62..192aedec0f4f 100644 --- a/starboard/android/shared/file_close.cc +++ b/starboard/android/shared/file_close.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/file.h" #include @@ -30,5 +28,3 @@ bool SbFileClose(SbFile file) { return ::starboard::shared::posix::impl::FileClose(file); } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/android/shared/file_delete.cc b/starboard/android/shared/file_delete.cc index 477b6ecc4bf0..9a0ab8b2c8ed 100644 --- a/starboard/android/shared/file_delete.cc +++ b/starboard/android/shared/file_delete.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/file.h" #include "starboard/android/shared/file_internal.h" @@ -22,5 +20,3 @@ bool SbFileDelete(const char* path) { return ::starboard::shared::posix::impl::FileDelete(path); } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/android/shared/file_exists.cc b/starboard/android/shared/file_exists.cc index 810315828180..cfe253c5db94 100644 --- a/starboard/android/shared/file_exists.cc +++ b/starboard/android/shared/file_exists.cc @@ -12,12 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 16 - #include "starboard/file.h" bool SbFileExists(const char* path) { return SbFileCanOpen(path, kSbFileRead); } - -#endif // SB_API_VERSION < 16 diff --git a/starboard/android/shared/file_flush.cc b/starboard/android/shared/file_flush.cc index 7ab036bb0f5c..25634ca4402b 100644 --- a/starboard/android/shared/file_flush.cc +++ b/starboard/android/shared/file_flush.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/file.h" #include "starboard/android/shared/file_internal.h" @@ -22,5 +20,3 @@ bool SbFileFlush(SbFile file) { return ::starboard::shared::posix::impl::FileFlush(file); } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/android/shared/file_get_info.cc b/starboard/android/shared/file_get_info.cc index c7979fbee19a..d7e755952cfc 100644 --- a/starboard/android/shared/file_get_info.cc +++ b/starboard/android/shared/file_get_info.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/file.h" #include @@ -34,5 +32,3 @@ bool SbFileGetInfo(SbFile file, SbFileInfo* out_info) { return ::starboard::shared::posix::impl::FileGetInfo(file, out_info); } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/android/shared/file_open.cc b/starboard/android/shared/file_open.cc index 8102b58f32d8..8d82ab584359 100644 --- a/starboard/android/shared/file_open.cc +++ b/starboard/android/shared/file_open.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/file.h" #include @@ -106,5 +104,3 @@ SbFile SbFileOpen(const char* path, } return kSbFileInvalid; } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/android/shared/file_read.cc b/starboard/android/shared/file_read.cc index 2d90d4f8d5b3..d283019f9813 100644 --- a/starboard/android/shared/file_read.cc +++ b/starboard/android/shared/file_read.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/file.h" #include @@ -32,5 +30,3 @@ int SbFileRead(SbFile file, char* data, int size) { return ::starboard::shared::posix::impl::FileRead(file, data, size); } } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/android/shared/file_seek.cc b/starboard/android/shared/file_seek.cc index e64f7fc5b6e9..590446b92e92 100644 --- a/starboard/android/shared/file_seek.cc +++ b/starboard/android/shared/file_seek.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/file.h" #include @@ -28,5 +26,3 @@ int64_t SbFileSeek(SbFile file, SbFileWhence whence, int64_t offset) { return ::starboard::shared::posix::impl::FileSeek(file, whence, offset); } } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/android/shared/file_truncate.cc b/starboard/android/shared/file_truncate.cc index fe96b632a924..c1075e789323 100644 --- a/starboard/android/shared/file_truncate.cc +++ b/starboard/android/shared/file_truncate.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/file.h" #include "starboard/android/shared/file_internal.h" @@ -22,5 +20,3 @@ bool SbFileTruncate(SbFile file, int64_t length) { return ::starboard::shared::posix::impl::FileTruncate(file, length); } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/android/shared/file_write.cc b/starboard/android/shared/file_write.cc index e6c99cb85515..77054354de06 100644 --- a/starboard/android/shared/file_write.cc +++ b/starboard/android/shared/file_write.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/file.h" #include "starboard/android/shared/file_internal.h" @@ -22,5 +20,3 @@ int SbFileWrite(SbFile file, const char* data, int size) { return ::starboard::shared::posix::impl::FileWrite(file, data, size); } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/elf_loader/exported_symbols.cc b/starboard/elf_loader/exported_symbols.cc index 1fe6b35db876..4b1a7856848e 100644 --- a/starboard/elf_loader/exported_symbols.cc +++ b/starboard/elf_loader/exported_symbols.cc @@ -175,29 +175,23 @@ ExportedSymbols::ExportedSymbols() { REGISTER_SYMBOL(SbEventCancel); REGISTER_SYMBOL(SbEventSchedule); REGISTER_SYMBOL(SbFileAtomicReplace); -#if SB_API_VERSION < 17 REGISTER_SYMBOL(SbFileCanOpen); REGISTER_SYMBOL(SbFileClose); REGISTER_SYMBOL(SbFileDelete); -#endif // SB_API_VERSION < 17 #if SB_API_VERSION < 16 REGISTER_SYMBOL(SbFileExists); #endif // SB_API_VERSION < 16 -#if SB_API_VERSION < 17 REGISTER_SYMBOL(SbFileFlush); REGISTER_SYMBOL(SbFileGetInfo); -#endif // SB_API_VERSION < 17 #if SB_API_VERSION < 16 REGISTER_SYMBOL(SbFileGetPathInfo); #endif // SB_API_VERSION < 16 -#if SB_API_VERSION < 17 REGISTER_SYMBOL(SbFileModeStringToFlags); REGISTER_SYMBOL(SbFileOpen); REGISTER_SYMBOL(SbFileRead); REGISTER_SYMBOL(SbFileSeek); REGISTER_SYMBOL(SbFileTruncate); REGISTER_SYMBOL(SbFileWrite); -#endif // SB_API_VERSION < 17 REGISTER_SYMBOL(SbGetEglInterface); REGISTER_SYMBOL(SbGetGlesInterface); #if SB_API_VERSION < 16 diff --git a/starboard/file.h b/starboard/file.h index ead07597879a..9a54ef79501f 100644 --- a/starboard/file.h +++ b/starboard/file.h @@ -127,8 +127,6 @@ static inline bool SbFileIsValid(SbFile file) { return file != kSbFileInvalid; } -#if SB_API_VERSION < 17 - // DEPRECATED with SB_API_VERSION 16 // // Opens the file at |path|, which must be absolute, creating it if specified by @@ -160,8 +158,6 @@ SB_EXPORT SbFile SbFileOpen(const char* path, // |file|: The absolute path of the file to be closed. SB_EXPORT bool SbFileClose(SbFile file); -#endif // SB_API_VERSION < 17 - // Replaces the content of the file at |path| with |data|. Returns whether the // contents of the file were replaced. The replacement of the content is an // atomic operation. The file will either have all of the data, or none. @@ -173,8 +169,6 @@ SB_EXPORT bool SbFileAtomicReplace(const char* path, const char* data, int64_t data_size); -#if SB_API_VERSION < 17 - // DEPRECATED with SB_API_VERSION 16 // // Changes the current read/write position in |file|. The return value @@ -270,8 +264,6 @@ SB_EXPORT bool SbFileGetPathInfo(const char* path, SbFileInfo* out_info); // |path|: The absolute path of the file, symlink, or directory to be deleted. SB_EXPORT bool SbFileDelete(const char* path); -#endif // SB_API_VERSION < 17 - #if SB_API_VERSION < 16 // Indicates whether a file or directory exists at |path|. // @@ -279,8 +271,6 @@ SB_EXPORT bool SbFileDelete(const char* path); SB_EXPORT bool SbFileExists(const char* path); #endif // SB_API_VERSION < 16 -#if SB_API_VERSION < 17 - // DEPRECATED with SB_API_VERSION 16 // // Indicates whether SbFileOpen() with the given |flags| is allowed for |path|. @@ -356,8 +346,6 @@ static inline int SbFileWriteAll(SbFile file, const char* data, int size) { return bytes_written ? bytes_written : rv; } -#endif // SB_API_VERSION < 17 - #ifdef __cplusplus } // extern "C" #endif diff --git a/starboard/nplb/file_can_open_test.cc b/starboard/nplb/file_can_open_test.cc index 93572606c15e..47bf3bb18c8f 100644 --- a/starboard/nplb/file_can_open_test.cc +++ b/starboard/nplb/file_can_open_test.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include #include "starboard/configuration_constants.h" @@ -72,5 +70,3 @@ TEST(SbFileCanOpenTest, ExistingStaticContentFileSucceeds) { } // namespace } // namespace nplb } // namespace starboard - -#endif // SB_API_VERSION < 17 diff --git a/starboard/nplb/file_close_test.cc b/starboard/nplb/file_close_test.cc index 2a40d4274b36..0c4c5a1c08a8 100644 --- a/starboard/nplb/file_close_test.cc +++ b/starboard/nplb/file_close_test.cc @@ -14,8 +14,6 @@ // SbFileClose is partially tested in file_open_test.cc. -#if SB_API_VERSION < 17 - #include "starboard/file.h" #include "testing/gtest/include/gtest/gtest.h" @@ -31,5 +29,3 @@ TEST(SbFileCloseTest, CloseInvalidFails) { } // namespace } // namespace nplb } // namespace starboard - -#endif // SB_API_VERSION < 17 diff --git a/starboard/nplb/file_delete_test.cc b/starboard/nplb/file_delete_test.cc index 95052867700d..92fbe199dffd 100644 --- a/starboard/nplb/file_delete_test.cc +++ b/starboard/nplb/file_delete_test.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include #include @@ -65,5 +63,3 @@ TEST(SbFileDeleteTest, RainyDayNonExistentFileErrors) { } // namespace } // namespace nplb } // namespace starboard - -#endif // SB_API_VERSION < 17 diff --git a/starboard/nplb/file_flush_test.cc b/starboard/nplb/file_flush_test.cc index 7b8b3143ccbd..d17795f912b3 100644 --- a/starboard/nplb/file_flush_test.cc +++ b/starboard/nplb/file_flush_test.cc @@ -14,8 +14,6 @@ // SbFileFlush is otherwise tested in SbFileWriteTest. -#if SB_API_VERSION < 17 - #include "starboard/file.h" #include "starboard/nplb/file_helpers.h" #include "testing/gtest/include/gtest/gtest.h" @@ -32,5 +30,3 @@ TEST(SbFileFlushTest, InvalidFileErrors) { } // namespace } // namespace nplb } // namespace starboard - -#endif // SB_API_VERSION < 17 diff --git a/starboard/nplb/file_get_info_test.cc b/starboard/nplb/file_get_info_test.cc index 2bfc5da8120a..6f531b39c8ba 100644 --- a/starboard/nplb/file_get_info_test.cc +++ b/starboard/nplb/file_get_info_test.cc @@ -14,8 +14,6 @@ // GetInfo is mostly tested in the course of other tests. -#if SB_API_VERSION < 17 - #include #include "starboard/common/time.h" @@ -89,5 +87,3 @@ TEST(SbFileGetInfoTest, WorksOnStaticContentFiles) { } // namespace } // namespace nplb } // namespace starboard - -#endif // SB_API_VERSION < 17 diff --git a/starboard/nplb/file_mode_string_to_flags_test.cc b/starboard/nplb/file_mode_string_to_flags_test.cc index 9efdf3a2163e..cc6c48f86870 100644 --- a/starboard/nplb/file_mode_string_to_flags_test.cc +++ b/starboard/nplb/file_mode_string_to_flags_test.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include #include "starboard/file.h" @@ -61,5 +59,3 @@ TEST(SbFileModeStringToFlagsTest, Aah) { } // namespace } // namespace nplb } // namespace starboard - -#endif // SB_API_VERSION < 17 diff --git a/starboard/nplb/file_open_test.cc b/starboard/nplb/file_open_test.cc index 4a99d746c886..ae19dec24c1e 100644 --- a/starboard/nplb/file_open_test.cc +++ b/starboard/nplb/file_open_test.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include #include @@ -167,5 +165,3 @@ TEST(SbFileOpenTest, OpenOnlyDoesNotOpenNonExistingStaticContentFile) { } // namespace } // namespace nplb } // namespace starboard - -#endif // SB_API_VERSION < 17 diff --git a/starboard/nplb/file_read_test.cc b/starboard/nplb/file_read_test.cc index 7d4d4a0a0d4e..f9aa51d9d29a 100644 --- a/starboard/nplb/file_read_test.cc +++ b/starboard/nplb/file_read_test.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include #include "starboard/file.h" @@ -296,5 +294,3 @@ TYPED_TEST(SbFileReadTest, ReadStaticContent) { } // namespace } // namespace nplb } // namespace starboard - -#endif // SB_API_VERSION < 17 diff --git a/starboard/nplb/file_read_write_all_test.cc b/starboard/nplb/file_read_write_all_test.cc index 6dc621363818..4871cea672a5 100644 --- a/starboard/nplb/file_read_write_all_test.cc +++ b/starboard/nplb/file_read_write_all_test.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/file.h" #include "starboard/nplb/file_helpers.h" #include "testing/gtest/include/gtest/gtest.h" @@ -65,5 +63,3 @@ INSTANTIATE_TEST_CASE_P( } // namespace } // namespace nplb } // namespace starboard - -#endif // SB_API_VERSION < 17 diff --git a/starboard/nplb/file_seek_test.cc b/starboard/nplb/file_seek_test.cc index 35789796c1e0..95bbdd4db35d 100644 --- a/starboard/nplb/file_seek_test.cc +++ b/starboard/nplb/file_seek_test.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include #include "starboard/file.h" @@ -237,5 +235,3 @@ TEST(SbFileSeekTest, FromBeginInStaticContentWorks) { } // namespace } // namespace nplb } // namespace starboard - -#endif // SB_API_VERSION < 17 diff --git a/starboard/nplb/file_truncate_test.cc b/starboard/nplb/file_truncate_test.cc index 6a316d2d7694..ae2b3dee8255 100644 --- a/starboard/nplb/file_truncate_test.cc +++ b/starboard/nplb/file_truncate_test.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include #include "starboard/file.h" @@ -117,5 +115,3 @@ TEST(SbFileTruncateTest, TruncateUpInSize) { } // namespace } // namespace nplb } // namespace starboard - -#endif // SB_API_VERSION < 17 diff --git a/starboard/nplb/file_write_test.cc b/starboard/nplb/file_write_test.cc index 6493a783bc30..9f6d87d578ac 100644 --- a/starboard/nplb/file_write_test.cc +++ b/starboard/nplb/file_write_test.cc @@ -15,8 +15,6 @@ // Writing is partially tested by some of the file helpers that create files for // the tests to operate on. -#if SB_API_VERSION < 17 - #include #include "starboard/file.h" @@ -169,5 +167,3 @@ TYPED_TEST(SbFileWriteTest, WriteZeroBytes) { } // namespace } // namespace nplb } // namespace starboard - -#endif // SB_API_VERSION < 17 diff --git a/starboard/shared/posix/file_can_open.cc b/starboard/shared/posix/file_can_open.cc index 896e5faf8b56..d0514d78e41d 100644 --- a/starboard/shared/posix/file_can_open.cc +++ b/starboard/shared/posix/file_can_open.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/shared/posix/file_internal.h" #include "starboard/shared/posix/impl/file_can_open.h" @@ -21,5 +19,3 @@ bool SbFileCanOpen(const char* path, int flags) { return ::starboard::shared::posix::impl::FileCanOpen(path, flags); } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/shared/posix/file_close.cc b/starboard/shared/posix/file_close.cc index f9a6f5d638e6..ebda5137605b 100644 --- a/starboard/shared/posix/file_close.cc +++ b/starboard/shared/posix/file_close.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/shared/posix/file_internal.h" #include "starboard/shared/posix/impl/file_close.h" @@ -21,5 +19,3 @@ bool SbFileClose(SbFile file) { return ::starboard::shared::posix::impl::FileClose(file); } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/shared/posix/file_delete.cc b/starboard/shared/posix/file_delete.cc index 3ad7ea095407..7830cebc5f88 100644 --- a/starboard/shared/posix/file_delete.cc +++ b/starboard/shared/posix/file_delete.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/shared/posix/file_internal.h" #include "starboard/shared/posix/impl/file_delete.h" @@ -21,5 +19,3 @@ bool SbFileDelete(const char* path) { return ::starboard::shared::posix::impl::FileDelete(path); } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/shared/posix/file_flush.cc b/starboard/shared/posix/file_flush.cc index 3f1a4c3c9751..e62aeb51db64 100644 --- a/starboard/shared/posix/file_flush.cc +++ b/starboard/shared/posix/file_flush.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/shared/posix/file_internal.h" #include "starboard/shared/posix/impl/file_flush.h" @@ -21,5 +19,3 @@ bool SbFileFlush(SbFile file) { return ::starboard::shared::posix::impl::FileFlush(file); } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/shared/posix/file_get_info.cc b/starboard/shared/posix/file_get_info.cc index 2443587bbce9..163462bc3175 100644 --- a/starboard/shared/posix/file_get_info.cc +++ b/starboard/shared/posix/file_get_info.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/shared/posix/file_internal.h" #include "starboard/shared/posix/impl/file_get_info.h" @@ -21,5 +19,3 @@ bool SbFileGetInfo(SbFile file, SbFileInfo* out_info) { return ::starboard::shared::posix::impl::FileGetInfo(file, out_info); } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/shared/posix/file_open.cc b/starboard/shared/posix/file_open.cc index 56675c63fd7a..b8d76cf2017f 100644 --- a/starboard/shared/posix/file_open.cc +++ b/starboard/shared/posix/file_open.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/shared/posix/file_internal.h" #include "starboard/shared/posix/impl/file_open.h" @@ -25,5 +23,3 @@ SbFile SbFileOpen(const char* path, return ::starboard::shared::posix::impl::FileOpen(path, flags, out_created, out_error); } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/shared/posix/file_read.cc b/starboard/shared/posix/file_read.cc index 3721a8b9b500..33d6debe31e4 100644 --- a/starboard/shared/posix/file_read.cc +++ b/starboard/shared/posix/file_read.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/shared/posix/file_internal.h" #include "starboard/shared/posix/impl/file_read.h" @@ -21,5 +19,3 @@ int SbFileRead(SbFile file, char* data, int size) { return ::starboard::shared::posix::impl::FileRead(file, data, size); } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/shared/posix/file_seek.cc b/starboard/shared/posix/file_seek.cc index ba6ba4ab47b9..4ece7e8f0712 100644 --- a/starboard/shared/posix/file_seek.cc +++ b/starboard/shared/posix/file_seek.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/shared/posix/file_internal.h" #include "starboard/shared/posix/impl/file_seek.h" @@ -21,5 +19,3 @@ int64_t SbFileSeek(SbFile file, SbFileWhence whence, int64_t offset) { return ::starboard::shared::posix::impl::FileSeek(file, whence, offset); } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/shared/posix/file_truncate.cc b/starboard/shared/posix/file_truncate.cc index f119fb3d0f4d..603dd0110fa7 100644 --- a/starboard/shared/posix/file_truncate.cc +++ b/starboard/shared/posix/file_truncate.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/shared/posix/file_internal.h" #include "starboard/shared/posix/impl/file_truncate.h" @@ -21,5 +19,3 @@ bool SbFileTruncate(SbFile file, int64_t length) { return ::starboard::shared::posix::impl::FileTruncate(file, length); } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/shared/posix/file_write.cc b/starboard/shared/posix/file_write.cc index 118d183de2b6..7b0af3dec16d 100644 --- a/starboard/shared/posix/file_write.cc +++ b/starboard/shared/posix/file_write.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/shared/posix/file_internal.h" #include "starboard/shared/posix/impl/file_write.h" @@ -21,5 +19,3 @@ int SbFileWrite(SbFile file, const char* data, int size) { return ::starboard::shared::posix::impl::FileWrite(file, data, size); } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/shared/starboard/file_mode_string_to_flags.cc b/starboard/shared/starboard/file_mode_string_to_flags.cc index d6c217869a45..b69d9741e86b 100644 --- a/starboard/shared/starboard/file_mode_string_to_flags.cc +++ b/starboard/shared/starboard/file_mode_string_to_flags.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/common/log.h" #include "starboard/common/string.h" #include "starboard/file.h" @@ -66,5 +64,3 @@ int SbFileModeStringToFlags(const char* mode) { } return flags; } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/shared/stub/file_can_open.cc b/starboard/shared/stub/file_can_open.cc index 132438067b99..7335af26ad2f 100644 --- a/starboard/shared/stub/file_can_open.cc +++ b/starboard/shared/stub/file_can_open.cc @@ -12,12 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/file.h" bool SbFileCanOpen(const char* path, int flags) { return false; } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/shared/stub/file_close.cc b/starboard/shared/stub/file_close.cc index 768d28e26435..47df9f2080d0 100644 --- a/starboard/shared/stub/file_close.cc +++ b/starboard/shared/stub/file_close.cc @@ -12,12 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/file.h" bool SbFileClose(SbFile file) { return false; } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/shared/stub/file_delete.cc b/starboard/shared/stub/file_delete.cc index 298b5e0912bf..ff3225fdd7e5 100644 --- a/starboard/shared/stub/file_delete.cc +++ b/starboard/shared/stub/file_delete.cc @@ -12,12 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/file.h" bool SbFileDelete(const char* path) { return false; } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/shared/stub/file_flush.cc b/starboard/shared/stub/file_flush.cc index 48268327c115..5598957a4628 100644 --- a/starboard/shared/stub/file_flush.cc +++ b/starboard/shared/stub/file_flush.cc @@ -12,12 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/file.h" bool SbFileFlush(SbFile file) { return false; } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/shared/stub/file_get_info.cc b/starboard/shared/stub/file_get_info.cc index aa8d32f762f2..40cf2ee956ee 100644 --- a/starboard/shared/stub/file_get_info.cc +++ b/starboard/shared/stub/file_get_info.cc @@ -12,12 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/file.h" bool SbFileGetInfo(SbFile file, SbFileInfo* out_info) { return false; } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/shared/stub/file_open.cc b/starboard/shared/stub/file_open.cc index 084fbd7eb37b..fe3332bdcca0 100644 --- a/starboard/shared/stub/file_open.cc +++ b/starboard/shared/stub/file_open.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/file.h" SbFile SbFileOpen(const char* path, @@ -22,5 +20,3 @@ SbFile SbFileOpen(const char* path, SbFileError* out_error) { return kSbFileInvalid; } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/shared/stub/file_read.cc b/starboard/shared/stub/file_read.cc index 8db62d342148..4bf60654861f 100644 --- a/starboard/shared/stub/file_read.cc +++ b/starboard/shared/stub/file_read.cc @@ -12,12 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/file.h" int SbFileRead(SbFile file, char* data, int size) { return 0; } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/shared/stub/file_seek.cc b/starboard/shared/stub/file_seek.cc index 3655631fd497..ac2dc2402013 100644 --- a/starboard/shared/stub/file_seek.cc +++ b/starboard/shared/stub/file_seek.cc @@ -12,12 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/file.h" int64_t SbFileSeek(SbFile file, SbFileWhence whence, int64_t offset) { return 0; } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/shared/stub/file_truncate.cc b/starboard/shared/stub/file_truncate.cc index 21c63ca67f52..b65a8cce8e41 100644 --- a/starboard/shared/stub/file_truncate.cc +++ b/starboard/shared/stub/file_truncate.cc @@ -12,12 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/file.h" bool SbFileTruncate(SbFile file, int64_t length) { return false; } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/shared/stub/file_write.cc b/starboard/shared/stub/file_write.cc index 35e1314a784c..d6e785874be8 100644 --- a/starboard/shared/stub/file_write.cc +++ b/starboard/shared/stub/file_write.cc @@ -12,12 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/file.h" int SbFileWrite(SbFile file, const char* data, int size) { return 0; } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/shared/win32/file_can_open.cc b/starboard/shared/win32/file_can_open.cc index 7744b103eec5..8f830b250e3e 100644 --- a/starboard/shared/win32/file_can_open.cc +++ b/starboard/shared/win32/file_can_open.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/file.h" #include @@ -54,5 +52,3 @@ bool SbFileCanOpen(const char* path, int flags) { return can_open; } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/shared/win32/file_close.cc b/starboard/shared/win32/file_close.cc index fa47181459dc..afd99ae3c9c5 100644 --- a/starboard/shared/win32/file_close.cc +++ b/starboard/shared/win32/file_close.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/file.h" #include @@ -38,5 +36,3 @@ bool SbFileClose(SbFile file) { return success; } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/shared/win32/file_delete.cc b/starboard/shared/win32/file_delete.cc index d20cd80ed217..2d5aa0cba3bd 100644 --- a/starboard/shared/win32/file_delete.cc +++ b/starboard/shared/win32/file_delete.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/file.h" #include @@ -39,5 +37,3 @@ bool SbFileDelete(const char* path) { return DeleteFileW(path_wstring.c_str()) || RemoveDirectoryW(path_wstring.c_str()); } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/shared/win32/file_flush.cc b/starboard/shared/win32/file_flush.cc index ad566da0cc73..c42e69e5db98 100644 --- a/starboard/shared/win32/file_flush.cc +++ b/starboard/shared/win32/file_flush.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/file.h" #include @@ -28,5 +26,3 @@ bool SbFileFlush(SbFile file) { return FlushFileBuffers(file->file_handle); } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/shared/win32/file_get_info.cc b/starboard/shared/win32/file_get_info.cc index f4176e5b014f..6a3bff46d956 100644 --- a/starboard/shared/win32/file_get_info.cc +++ b/starboard/shared/win32/file_get_info.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/file.h" #include @@ -58,5 +56,3 @@ bool SbFileGetInfo(SbFile file, SbFileInfo* out_info) { return true; } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/shared/win32/file_read.cc b/starboard/shared/win32/file_read.cc index f8415ae71765..e0efce44825e 100644 --- a/starboard/shared/win32/file_read.cc +++ b/starboard/shared/win32/file_read.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/file.h" #include @@ -47,5 +45,3 @@ int SbFileRead(SbFile file, char* data, int size) { return number_bytes_read; } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/shared/win32/file_seek.cc b/starboard/shared/win32/file_seek.cc index 117df70b36a7..640059430da7 100644 --- a/starboard/shared/win32/file_seek.cc +++ b/starboard/shared/win32/file_seek.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/file.h" #include @@ -38,5 +36,3 @@ int64_t SbFileSeek(SbFile file, SbFileWhence whence, int64_t offset) { return new_file_pointer.QuadPart; } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/shared/win32/file_truncate.cc b/starboard/shared/win32/file_truncate.cc index 21fef69fa87e..7e77ab97ca38 100644 --- a/starboard/shared/win32/file_truncate.cc +++ b/starboard/shared/win32/file_truncate.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/file.h" #include @@ -102,5 +100,3 @@ bool SbFileTruncate(SbFile file, int64_t length) { return return_value; } - -#endif // SB_API_VERSION < 17 diff --git a/starboard/shared/win32/file_write.cc b/starboard/shared/win32/file_write.cc index b95460c8b0f6..6e56f68f9ffc 100644 --- a/starboard/shared/win32/file_write.cc +++ b/starboard/shared/win32/file_write.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION < 17 - #include "starboard/file.h" #include @@ -42,5 +40,3 @@ int SbFileWrite(SbFile file, const char* data, int size) { return bytes_written; } - -#endif // SB_API_VERSION < 17