| Index: src/trusted/plugin/shared_memory.h
|
| ===================================================================
|
| --- src/trusted/plugin/shared_memory.h (revision 2712)
|
| +++ src/trusted/plugin/shared_memory.h (working copy)
|
| @@ -6,8 +6,8 @@
|
|
|
| // A portable representation of a scriptable shared memory object.
|
|
|
| -#ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SRPC_SHARED_MEMORY_H_
|
| -#define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SRPC_SHARED_MEMORY_H_
|
| +#ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SHARED_MEMORY_H_
|
| +#define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SHARED_MEMORY_H_
|
|
|
| #include <setjmp.h>
|
| #include <stdio.h>
|
| @@ -15,8 +15,8 @@
|
| #include "native_client/src/include/nacl_macros.h"
|
| #include "native_client/src/trusted/desc/nacl_desc_imc_shm.h"
|
| #include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
|
| -#include "native_client/src/trusted/plugin/srpc/desc_based_handle.h"
|
| -#include "native_client/src/trusted/plugin/srpc/utility.h"
|
| +#include "native_client/src/trusted/plugin/desc_based_handle.h"
|
| +#include "native_client/src/trusted/plugin/utility.h"
|
|
|
| namespace plugin {
|
|
|
| @@ -46,4 +46,4 @@
|
|
|
| } // namespace plugin
|
|
|
| -#endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SRPC_SHARED_MEMORY_H_
|
| +#endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SHARED_MEMORY_H_
|
|
|
| Property changes on: src/trusted/plugin/shared_memory.h
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
|
|
|
|