| Index: mojo/public/c/system/data_pipe.h
|
| diff --git a/mojo/public/c/system/data_pipe.h b/mojo/public/c/system/data_pipe.h
|
| index 3efe1c73b0f5f20c4bd5671ccf8bf674da28addc..abca6ac89550bbc33cf2ec5059bf72571b772e27 100644
|
| --- a/mojo/public/c/system/data_pipe.h
|
| +++ b/mojo/public/c/system/data_pipe.h
|
| @@ -10,7 +10,6 @@
|
| #define MOJO_PUBLIC_C_SYSTEM_DATA_PIPE_H_
|
|
|
| #include "mojo/public/c/system/macros.h"
|
| -#include "mojo/public/c/system/system_export.h"
|
| #include "mojo/public/c/system/types.h"
|
|
|
| // |MojoCreateDataPipeOptions|: Used to specify creation parameters for a data
|
| @@ -125,7 +124,7 @@ extern "C" {
|
| // been reached (e.g., if the requested capacity was too large, or if the
|
| // maximum number of handles was exceeded).
|
| // |MOJO_RESULT_UNIMPLEMENTED| if an unsupported flag was set in |*options|.
|
| -MOJO_SYSTEM_EXPORT MojoResult MojoCreateDataPipe(
|
| +MojoResult MojoCreateDataPipe(
|
| const struct MojoCreateDataPipeOptions* options, // Optional.
|
| MojoHandle* data_pipe_producer_handle, // Out.
|
| MojoHandle* data_pipe_consumer_handle); // Out.
|
| @@ -158,11 +157,10 @@ MOJO_SYSTEM_EXPORT MojoResult MojoCreateDataPipe(
|
| // |MOJO_WRITE_DATA_FLAG_ALL_OR_NONE| set.
|
| //
|
| // TODO(vtl): Should there be a way of querying how much data can be written?
|
| -MOJO_SYSTEM_EXPORT MojoResult
|
| -MojoWriteData(MojoHandle data_pipe_producer_handle,
|
| - const void* elements,
|
| - uint32_t* num_bytes, // In/out.
|
| - MojoWriteDataFlags flags);
|
| +MojoResult MojoWriteData(MojoHandle data_pipe_producer_handle,
|
| + const void* elements,
|
| + uint32_t* num_bytes, // In/out.
|
| + MojoWriteDataFlags flags);
|
|
|
| // Begins a two-phase write to the data pipe producer given by
|
| // |data_pipe_producer_handle|. On success, |*buffer| will be a pointer to which
|
| @@ -191,11 +189,10 @@ MojoWriteData(MojoHandle data_pipe_producer_handle,
|
| // called, but not yet the matching |MojoEndWriteData()|).
|
| // |MOJO_RESULT_SHOULD_WAIT| if no data can currently be written (and the
|
| // consumer is still open).
|
| -MOJO_SYSTEM_EXPORT MojoResult
|
| -MojoBeginWriteData(MojoHandle data_pipe_producer_handle,
|
| - void** buffer, // Out.
|
| - uint32_t* buffer_num_bytes, // Out.
|
| - MojoWriteDataFlags flags);
|
| +MojoResult MojoBeginWriteData(MojoHandle data_pipe_producer_handle,
|
| + void** buffer, // Out.
|
| + uint32_t* buffer_num_bytes, // Out.
|
| + MojoWriteDataFlags flags);
|
|
|
| // Ends a two-phase write to the data pipe producer given by
|
| // |data_pipe_producer_handle| that was begun by a call to
|
| @@ -219,9 +216,8 @@ MojoBeginWriteData(MojoHandle data_pipe_producer_handle,
|
| // |MOJO_RESULT_FAILED_PRECONDITION| if the data pipe producer is not in a
|
| // two-phase write (e.g., |MojoBeginWriteData()| was not called or
|
| // |MojoEndWriteData()| has already been called).
|
| -MOJO_SYSTEM_EXPORT MojoResult
|
| -MojoEndWriteData(MojoHandle data_pipe_producer_handle,
|
| - uint32_t num_bytes_written);
|
| +MojoResult MojoEndWriteData(MojoHandle data_pipe_producer_handle,
|
| + uint32_t num_bytes_written);
|
|
|
| // Reads data from the data pipe consumer given by |data_pipe_consumer_handle|.
|
| // May also be used to discard data or query the amount of data available.
|
| @@ -267,10 +263,10 @@ MojoEndWriteData(MojoHandle data_pipe_producer_handle,
|
| // |MOJO_RESULT_SHOULD_WAIT| if there is no data to be read or discarded (and
|
| // the producer is still open) and |flags| does *not* have
|
| // |MOJO_READ_DATA_FLAG_ALL_OR_NONE| set.
|
| -MOJO_SYSTEM_EXPORT MojoResult MojoReadData(MojoHandle data_pipe_consumer_handle,
|
| - void* elements, // Out.
|
| - uint32_t* num_bytes, // In/out.
|
| - MojoReadDataFlags flags);
|
| +MojoResult MojoReadData(MojoHandle data_pipe_consumer_handle,
|
| + void* elements, // Out.
|
| + uint32_t* num_bytes, // In/out.
|
| + MojoReadDataFlags flags);
|
|
|
| // Begins a two-phase read from the data pipe consumer given by
|
| // |data_pipe_consumer_handle|. On success, |*buffer| will be a pointer from
|
| @@ -298,11 +294,10 @@ MOJO_SYSTEM_EXPORT MojoResult MojoReadData(MojoHandle data_pipe_consumer_handle,
|
| // called, but not yet the matching |MojoEndReadData()|).
|
| // |MOJO_RESULT_SHOULD_WAIT| if no data can currently be read (and the
|
| // producer is still open).
|
| -MOJO_SYSTEM_EXPORT MojoResult
|
| -MojoBeginReadData(MojoHandle data_pipe_consumer_handle,
|
| - const void** buffer, // Out.
|
| - uint32_t* buffer_num_bytes, // Out.
|
| - MojoReadDataFlags flags);
|
| +MojoResult MojoBeginReadData(MojoHandle data_pipe_consumer_handle,
|
| + const void** buffer, // Out.
|
| + uint32_t* buffer_num_bytes, // Out.
|
| + MojoReadDataFlags flags);
|
|
|
| // Ends a two-phase read from the data pipe consumer given by
|
| // |data_pipe_consumer_handle| that was begun by a call to |MojoBeginReadData()|
|
| @@ -323,8 +318,8 @@ MojoBeginReadData(MojoHandle data_pipe_consumer_handle,
|
| // |MOJO_RESULT_FAILED_PRECONDITION| if the data pipe consumer is not in a
|
| // two-phase read (e.g., |MojoBeginReadData()| was not called or
|
| // |MojoEndReadData()| has already been called).
|
| -MOJO_SYSTEM_EXPORT MojoResult
|
| -MojoEndReadData(MojoHandle data_pipe_consumer_handle, uint32_t num_bytes_read);
|
| +MojoResult MojoEndReadData(MojoHandle data_pipe_consumer_handle,
|
| + uint32_t num_bytes_read);
|
|
|
| #ifdef __cplusplus
|
| } // extern "C"
|
|
|