| Index: src/trusted/plugin/stream_shm_buffer.h
|
| ===================================================================
|
| --- src/trusted/plugin/stream_shm_buffer.h (revision 2712)
|
| +++ src/trusted/plugin/stream_shm_buffer.h (working copy)
|
| @@ -7,11 +7,11 @@
|
| // A representation of a shared memory buffer abstraction. These are used
|
| // to communicate between the renderer and the service runtime.
|
|
|
| -#ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SRPC_STREAM_SHM_BUFFER_H_
|
| -#define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SRPC_STREAM_SHM_BUFFER_H_
|
| +#ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_STREAM_SHM_BUFFER_H_
|
| +#define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_STREAM_SHM_BUFFER_H_
|
|
|
| +#include "native_client/src/include/nacl_macros.h"
|
| #include "native_client/src/include/portability.h"
|
| -#include "native_client/src/include/nacl_macros.h"
|
|
|
| struct NaClGioShmUnbounded;
|
| struct NaClDesc;
|
| @@ -33,4 +33,4 @@
|
|
|
| } // namespace plugin
|
|
|
| -#endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SRPC_STREAM_SHM_BUFFER_H_
|
| +#endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_STREAM_SHM_BUFFER_H_
|
|
|
| Property changes on: src/trusted/plugin/stream_shm_buffer.h
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
|
|
|
|