| Index: mojo/edk/embedder/platform_channel_utils_posix.h
|
| diff --git a/mojo/edk/embedder/platform_channel_utils_posix.h b/mojo/edk/embedder/platform_channel_utils_posix.h
|
| index 242c5fe586fd410da36c04361b0aedac142633a4..429cffa5ed45c21abe653dc17750f915f50e3c65 100644
|
| --- a/mojo/edk/embedder/platform_channel_utils_posix.h
|
| +++ b/mojo/edk/embedder/platform_channel_utils_posix.h
|
| @@ -11,7 +11,6 @@
|
| #include <deque>
|
|
|
| #include "mojo/edk/embedder/platform_handle.h"
|
| -#include "mojo/edk/system/system_impl_export.h"
|
|
|
| struct iovec; // Declared in <sys/uio.h>.
|
|
|
| @@ -28,10 +27,12 @@ const size_t kPlatformChannelMaxNumHandles = 128;
|
| // equivalent). These are like |write()| and |writev()|, but handle |EINTR| and
|
| // never raise |SIGPIPE|. (Note: On Mac, the suppression of |SIGPIPE| is set up
|
| // by |PlatformChannelPair|.)
|
| -MOJO_SYSTEM_IMPL_EXPORT ssize_t
|
| -PlatformChannelWrite(PlatformHandle h, const void* bytes, size_t num_bytes);
|
| -MOJO_SYSTEM_IMPL_EXPORT ssize_t
|
| -PlatformChannelWritev(PlatformHandle h, struct iovec* iov, size_t num_iov);
|
| +ssize_t PlatformChannelWrite(PlatformHandle h,
|
| + const void* bytes,
|
| + size_t num_bytes);
|
| +ssize_t PlatformChannelWritev(PlatformHandle h,
|
| + struct iovec* iov,
|
| + size_t num_iov);
|
|
|
| // Writes data, and the given set of |PlatformHandle|s (i.e., file descriptors)
|
| // over the Unix domain socket given by |h| (e.g., created using
|
| @@ -41,12 +42,11 @@ PlatformChannelWritev(PlatformHandle h, struct iovec* iov, size_t num_iov);
|
| // bytes of data sent on success (note that this may not be all the data
|
| // specified by |iov|). (The handles are not closed, regardless of success or
|
| // failure.)
|
| -MOJO_SYSTEM_IMPL_EXPORT ssize_t
|
| -PlatformChannelSendmsgWithHandles(PlatformHandle h,
|
| - struct iovec* iov,
|
| - size_t num_iov,
|
| - PlatformHandle* platform_handles,
|
| - size_t num_platform_handles);
|
| +ssize_t PlatformChannelSendmsgWithHandles(PlatformHandle h,
|
| + struct iovec* iov,
|
| + size_t num_iov,
|
| + PlatformHandle* platform_handles,
|
| + size_t num_platform_handles);
|
|
|
| // TODO(vtl): Remove this once I've switched things over to
|
| // |PlatformChannelSendmsgWithHandles()|.
|
| @@ -56,18 +56,17 @@ PlatformChannelSendmsgWithHandles(PlatformHandle h,
|
| // the file descriptors.) All of the handles must be valid, and there must be at
|
| // most |kPlatformChannelMaxNumHandles| (and at least one handle). Returns true
|
| // on success, in which case it closes all the handles.
|
| -MOJO_SYSTEM_IMPL_EXPORT bool PlatformChannelSendHandles(PlatformHandle h,
|
| - PlatformHandle* handles,
|
| - size_t num_handles);
|
| +bool PlatformChannelSendHandles(PlatformHandle h,
|
| + PlatformHandle* handles,
|
| + size_t num_handles);
|
|
|
| // Wrapper around |recvmsg()|, which will extract any attached file descriptors
|
| // (in the control message) to |PlatformHandle|s (and append them to
|
| // |platform_handles|). (This also handles |EINTR|.)
|
| -MOJO_SYSTEM_IMPL_EXPORT ssize_t
|
| -PlatformChannelRecvmsg(PlatformHandle h,
|
| - void* buf,
|
| - size_t num_bytes,
|
| - std::deque<PlatformHandle>* platform_handles);
|
| +ssize_t PlatformChannelRecvmsg(PlatformHandle h,
|
| + void* buf,
|
| + size_t num_bytes,
|
| + std::deque<PlatformHandle>* platform_handles);
|
|
|
| } // namespace embedder
|
| } // namespace mojo
|
|
|