[NaCL SDK] Ship sys/mount.h for newlib/pnacl.

native_client_sdk/src/libraries/nacl_io/nacl_io.h

Index: native_client_sdk/src/libraries/nacl_io/nacl_io.h
diff --git a/native_client_sdk/src/libraries/nacl_io/nacl_io.h b/native_client_sdk/src/libraries/nacl_io/nacl_io.h
index e72b5a5f5ae29009fc3666a2760577d09b31f283..43709bb767e0a6326f4d4a404ff910ee24ab31ce 100644
--- a/native_client_sdk/src/libraries/nacl_io/nacl_io.h
+++ b/native_client_sdk/src/libraries/nacl_io/nacl_io.h
@@ -8,43 +8,21 @@
 #include <ppapi/c/pp_instance.h>
 #include <ppapi/c/ppb.h>
 
-#include "nacl_io/kernel_wrap.h"
 #include "sdk_util/macros.h"
 
 EXTERN_C_BEGIN
 
-
-/** Initialize nacl_io.
+/**
+ * Initialize nacl_io.
  *
  * NOTE: If you initialize nacl_io with this constructor, you cannot
  * use any mounts that require PPAPI; e.g. persistent storage, etc.
- */
-void nacl_io_init();
-
-/** Initialize nacl_io with PPAPI support.
  *
- * Usage:
- *   PP_Instance instance;
- *   PPB_GetInterface get_interface;
- *   nacl_io_init(instance, get_interface);
- *
- * If you are using the PPAPI C interface:
- *   |instance| is passed to your instance in the DidCreate function.
- *   |get_interface| is passed to your module in the PPP_InitializeModule
- *   function.
+ * Once nacl_io is initialised the mount(2)/umount(2) system calls

[binji, 2013/08/09 21:10:39]

we use initialize above, so be consistent. :)

[Sam Clegg, 2013/08/09 21:19:02]

Removed.

+ * can be used to mount a new filesystem types.
  *
- * If you are using the PPAPI C++ interface:
- *   |instance| can be retrieved via the pp::Instance::pp_instance() method.
- *   |get_interface| can be retrieved via
- *       pp::Module::Get()->get_browser_interface()
- */
-void nacl_io_init_ppapi(PP_Instance instance,
-                        PPB_GetInterface get_interface);
-
-
-/** Mount a new filesystem type.
- *
- * Some parameters are dependent on the filesystem type being mounted.
+ * The parameters to pass to mount(2) are dependent on the filesystem type

[binji, 2013/08/09 21:10:39]

I don't really like combining this documentation here. Maybe keep it separated
like before, but just comment out the "mount" declaration?

[Sam Clegg, 2013/08/09 21:19:02]

Done.

+ * being mounted.
  *
  * The |data| parameter, if used, is always parsed as a string of comma
  * separated key-value pairs:
@@ -107,10 +85,29 @@ void nacl_io_init_ppapi(PP_Instance instance,
  *     above for examples.
  * @param[in] mountflags Unused.
  * @param[in] data Depends on the filesystem type. See above.
- * @return 0 on success, -1 on failure (with errno set).
  */
-int mount(const char* source, const char* target, const char* filesystemtype,
-          unsigned long mountflags, const void *data) NOTHROW;
+void nacl_io_init();
+
+/**
+ * Initialize nacl_io with PPAPI support.
+ *
+ * Usage:
+ *   PP_Instance instance;
+ *   PPB_GetInterface get_interface;
+ *   nacl_io_init(instance, get_interface);
+ *
+ * If you are using the PPAPI C interface:
+ *   |instance| is passed to your instance in the DidCreate function.
+ *   |get_interface| is passed to your module in the PPP_InitializeModule
+ *   function.
+ *
+ * If you are using the PPAPI C++ interface:
+ *   |instance| can be retrieved via the pp::Instance::pp_instance() method.
+ *   |get_interface| can be retrieved via
+ *       pp::Module::Get()->get_browser_interface()
+ */
+void nacl_io_init_ppapi(PP_Instance instance,
+                        PPB_GetInterface get_interface);
 
 EXTERN_C_END