Skip to content

Commit

Permalink
The NaCL mount/unmount functions need to be in SDL_system.h and speci…
Browse files Browse the repository at this point in the history
…fic to NaCL
  • Loading branch information
slouken committed Jun 8, 2014
1 parent be74705 commit 5ae12b4
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 36 deletions.
12 changes: 0 additions & 12 deletions include/SDL_rwops.h
Expand Up @@ -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
}
Expand Down
24 changes: 0 additions & 24 deletions src/file/SDL_rwops.c
Expand Up @@ -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: */

0 comments on commit 5ae12b4

Please sign in to comment.