Index: src/trusted/plugin/method_map.cc |
=================================================================== |
--- src/trusted/plugin/method_map.cc (revision 2712) |
+++ src/trusted/plugin/method_map.cc (working copy) |
@@ -9,15 +9,13 @@ |
#include "native_client/src/include/checked_cast.h" |
#include "native_client/src/shared/platform/nacl_log.h" |
- |
#include "native_client/src/trusted/desc/nacl_desc_base.h" |
#include "native_client/src/trusted/nonnacl_util/sel_ldr_launcher.h" |
+#include "native_client/src/trusted/plugin/method_map.h" |
+#include "native_client/src/trusted/plugin/plugin.h" |
+#include "native_client/src/trusted/plugin/srpc_client.h" |
+#include "native_client/src/trusted/plugin/utility.h" |
-#include "native_client/src/trusted/plugin/srpc/method_map.h" |
-#include "native_client/src/trusted/plugin/srpc/plugin.h" |
-#include "native_client/src/trusted/plugin/srpc/srpc_client.h" |
-#include "native_client/src/trusted/plugin/srpc/utility.h" |
- |
using nacl::assert_cast; |
namespace { |
Property changes on: src/trusted/plugin/method_map.cc |
___________________________________________________________________ |
Added: svn:mergeinfo |