The NaCL mount/unmount functions need to be in SDL_system.h and specific to NaCL
authorSam Lantinga <slouken@libsdl.org>
Sun, 08 Jun 2014 12:05:17 -0700
changeset 88507e248a233387
parent 8849 1c2c95a5b033
child 8851 a7cfe554d337
The NaCL mount/unmount functions need to be in SDL_system.h and specific to NaCL
include/SDL_rwops.h
src/file/SDL_rwops.c
     1.1 --- a/include/SDL_rwops.h	Sun Jun 08 12:00:29 2014 -0700
     1.2 +++ b/include/SDL_rwops.h	Sun Jun 08 12:05:17 2014 -0700
     1.3 @@ -220,18 +220,6 @@
     1.4  extern DECLSPEC size_t SDLCALL SDL_WriteBE64(SDL_RWops * dst, Uint64 value);
     1.5  /* @} *//* Write endian functions */
     1.6  
     1.7 -/**
     1.8 - *  \name Mount/umount functions
     1.9 - *
    1.10 - *  Required for RWops on Native Client
    1.11 - */
    1.12 -/* @{ */
    1.13 -extern DECLSPEC int SDLCALL SDL_RWMount(const char* source, const char* target, 
    1.14 -                                        const char* filesystemtype, 
    1.15 -                                        unsigned long mountflags, const void *data);
    1.16 -extern DECLSPEC int SDLCALL SDL_RWUmount(const char *target);
    1.17 -/* @} *//* Mount/umount functions */
    1.18 -
    1.19  /* Ends C function definitions when using C++ */
    1.20  #ifdef __cplusplus
    1.21  }
     2.1 --- a/src/file/SDL_rwops.c	Sun Jun 08 12:00:29 2014 -0700
     2.2 +++ b/src/file/SDL_rwops.c	Sun Jun 08 12:05:17 2014 -0700
     2.3 @@ -766,28 +766,4 @@
     2.4      return SDL_RWwrite(dst, &swapped, sizeof (swapped), 1);
     2.5  }
     2.6  
     2.7 -
     2.8 -/* SDL_RWops on NACL are implemented using nacl_io, and require mount points
     2.9 - * to be established before actual file operations are performed
    2.10 - * 
    2.11 - * Ref: https://developers.google.com/native-client/dev/devguide/coding/nacl_io?hl=es
    2.12 - */
    2.13 -
    2.14 -int 
    2.15 -SDL_RWMount(const char* source, const char* target, const char* filesystemtype, 
    2.16 -          unsigned long mountflags, const void *data) {
    2.17 -#if __NACL__
    2.18 -    return mount(source, target, filesystemtype, mountflags, data);
    2.19 -#endif /* __NACL__ */
    2.20 -    return SDL_SetError ("Mount not supported on this platform");
    2.21 -}
    2.22 -
    2.23 -int 
    2.24 -SDL_RWUmount(const char *target) {
    2.25 -#if __NACL__
    2.26 -    return umount(target);
    2.27 -#endif /* __NACL__ */
    2.28 -    return SDL_SetError ("Umount not supported on this platform");
    2.29 -}
    2.30 -
    2.31  /* vi: set ts=4 sw=4 expandtab: */