Chromium Code Reviews| Index: mojo/public/platform/native/system_thunks.h |
| diff --git a/mojo/public/platform/native/system_thunks.h b/mojo/public/platform/native/system_thunks.h |
| index de82eba1bfc1e7adedb30737f1c575e0de8c13c0..cdc51ed9856f4cbe2603f2cbd855c6b8e00453ec 100644 |
| --- a/mojo/public/platform/native/system_thunks.h |
| +++ b/mojo/public/platform/native/system_thunks.h |
| @@ -43,9 +43,10 @@ struct MojoSystemThunks { |
| const MojoHandleSignals* signals, |
| uint32_t num_handles, |
| MojoDeadline deadline); |
| - MojoResult (*CreateMessagePipe)(const MojoCreateMessagePipeOptions* options, |
| - MojoHandle* message_pipe_handle0, |
| - MojoHandle* message_pipe_handle1); |
| + MojoResult (*CreateMessagePipe)( |
| + const struct MojoCreateMessagePipeOptions* options, |
| + MojoHandle* message_pipe_handle0, |
| + MojoHandle* message_pipe_handle1); |
| MojoResult (*WriteMessage)(MojoHandle message_pipe_handle, |
| const void* bytes, |
| uint32_t num_bytes, |
| @@ -58,7 +59,7 @@ struct MojoSystemThunks { |
| MojoHandle* handles, |
| uint32_t* num_handles, |
| MojoReadMessageFlags flags); |
| - MojoResult (*CreateDataPipe)(const MojoCreateDataPipeOptions* options, |
| + MojoResult (*CreateDataPipe)(const struct MojoCreateDataPipeOptions* options, |
| MojoHandle* data_pipe_producer_handle, |
| MojoHandle* data_pipe_consumer_handle); |
| MojoResult (*WriteData)(MojoHandle data_pipe_producer_handle, |
| @@ -82,12 +83,12 @@ struct MojoSystemThunks { |
| MojoResult (*EndReadData)(MojoHandle data_pipe_consumer_handle, |
| uint32_t num_elements_read); |
| MojoResult (*CreateSharedBuffer)( |
| - const MojoCreateSharedBufferOptions* options, |
| + const struct MojoCreateSharedBufferOptions* options, |
| uint64_t num_bytes, |
| MojoHandle* shared_buffer_handle); |
| MojoResult (*DuplicateBufferHandle)( |
| MojoHandle buffer_handle, |
| - const MojoDuplicateBufferHandleOptions* options, |
| + const struct MojoDuplicateBufferHandleOptions* options, |
| MojoHandle* new_buffer_handle); |
| MojoResult (*MapBuffer)(MojoHandle buffer_handle, |
| uint64_t offset, |
| @@ -100,9 +101,9 @@ struct MojoSystemThunks { |
| // Intended to be called from the embedder. Returns a |MojoCore| initialized |
| // to contain pointers to each of the embedder's MojoCore functions. |
| -inline MojoSystemThunks MojoMakeSystemThunks() { |
| - MojoSystemThunks system_thunks = { |
| - sizeof(MojoSystemThunks), |
| +inline struct MojoSystemThunks MojoMakeSystemThunks() { |
|
viettrungluu
2014/09/23 13:44:43
... though "inline" requires either C99 (or a comp
tburkard
2014/09/23 13:52:21
Done.
tburkard
2014/09/23 13:54:57
Should it really be ifndef? or ifdef?
Thanks.
|
| + struct MojoSystemThunks system_thunks = { |
| + sizeof(struct MojoSystemThunks), |
| MojoGetTimeTicksNow, |
| MojoClose, |
| MojoWait, |
| @@ -132,6 +133,7 @@ inline MojoSystemThunks MojoMakeSystemThunks() { |
| // "MojoSetSystemThunks")); |
| // The expected size of |system_thunks} is returned. |
| // The contents of |system_thunks| are copied. |
| -typedef size_t (*MojoSetSystemThunksFn)(const MojoSystemThunks* system_thunks); |
| +typedef size_t (*MojoSetSystemThunksFn)( |
| + const struct MojoSystemThunks* system_thunks); |
| #endif // MOJO_PUBLIC_PLATFORM_NATIVE_SYSTEM_THUNKS_H_ |