From 5ae12b46b54306d3e5fbb78f9fca042dbec2d0b2 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sun, 8 Jun 2014 12:05:17 -0700 Subject: [PATCH] The NaCL mount/unmount functions need to be in SDL_system.h and specific to NaCL --- include/SDL_rwops.h | 12 ------------ src/file/SDL_rwops.c | 24 ------------------------ 2 files changed, 36 deletions(-) diff --git a/include/SDL_rwops.h b/include/SDL_rwops.h index 5a47ef8a5..b007fb632 100644 --- a/include/SDL_rwops.h +++ b/include/SDL_rwops.h @@ -220,18 +220,6 @@ extern DECLSPEC size_t SDLCALL SDL_WriteLE64(SDL_RWops * dst, Uint64 value); extern DECLSPEC size_t SDLCALL SDL_WriteBE64(SDL_RWops * dst, Uint64 value); /* @} *//* Write endian functions */ -/** - * \name Mount/umount functions - * - * Required for RWops on Native Client - */ -/* @{ */ -extern DECLSPEC int SDLCALL SDL_RWMount(const char* source, const char* target, - const char* filesystemtype, - unsigned long mountflags, const void *data); -extern DECLSPEC int SDLCALL SDL_RWUmount(const char *target); -/* @} *//* Mount/umount functions */ - /* Ends C function definitions when using C++ */ #ifdef __cplusplus } diff --git a/src/file/SDL_rwops.c b/src/file/SDL_rwops.c index 14f3cd1a7..41f6c6d0c 100644 --- a/src/file/SDL_rwops.c +++ b/src/file/SDL_rwops.c @@ -766,28 +766,4 @@ SDL_WriteBE64(SDL_RWops * dst, Uint64 value) return SDL_RWwrite(dst, &swapped, sizeof (swapped), 1); } - -/* SDL_RWops on NACL are implemented using nacl_io, and require mount points - * to be established before actual file operations are performed - * - * Ref: https://developers.google.com/native-client/dev/devguide/coding/nacl_io?hl=es - */ - -int -SDL_RWMount(const char* source, const char* target, const char* filesystemtype, - unsigned long mountflags, const void *data) { -#if __NACL__ - return mount(source, target, filesystemtype, mountflags, data); -#endif /* __NACL__ */ - return SDL_SetError ("Mount not supported on this platform"); -} - -int -SDL_RWUmount(const char *target) { -#if __NACL__ - return umount(target); -#endif /* __NACL__ */ - return SDL_SetError ("Umount not supported on this platform"); -} - /* vi: set ts=4 sw=4 expandtab: */