Commit 5ae12b46b54306d3e5fbb78f9fca042dbec2d0b2
2014-06-08T12:05:17
The NaCL mount/unmount functions need to be in SDL_system.h and specific to NaCL
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56
diff --git a/include/SDL_rwops.h b/include/SDL_rwops.h
index 5a47ef8..b007fb6 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 14f3cd1..41f6c6d 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: */