| Index: src/trusted/plugin/shared_memory.cc
|
| ===================================================================
|
| --- src/trusted/plugin/shared_memory.cc (revision 2712)
|
| +++ src/trusted/plugin/shared_memory.cc (working copy)
|
| @@ -12,12 +12,12 @@
|
| #include "native_client/src/include/checked_cast.h"
|
| #include "native_client/src/include/nacl_platform.h"
|
|
|
| +#include "native_client/src/shared/imc/nacl_imc.h"
|
| #include "native_client/src/shared/platform/nacl_host_desc.h"
|
| -#include "native_client/src/shared/imc/nacl_imc.h"
|
|
|
| -#include "native_client/src/trusted/plugin/srpc/plugin.h"
|
| -#include "native_client/src/trusted/plugin/srpc/shared_memory.h"
|
| -#include "native_client/src/trusted/plugin/srpc/utility.h"
|
| +#include "native_client/src/trusted/plugin/plugin.h"
|
| +#include "native_client/src/trusted/plugin/shared_memory.h"
|
| +#include "native_client/src/trusted/plugin/utility.h"
|
|
|
| #include "native_client/src/trusted/service_runtime/include/bits/mman.h"
|
| #include "native_client/src/trusted/service_runtime/include/sys/stat.h"
|
|
|
| Property changes on: src/trusted/plugin/shared_memory.cc
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
|
|
|
|