| Index: third_party/mojo/src/mojo/edk/system/memory.h
|
| diff --git a/third_party/mojo/src/mojo/edk/system/memory.h b/third_party/mojo/src/mojo/edk/system/memory.h
|
| index 31d67cc94d84d32d1e44928c225f2801b9ee2fbb..3e9f79aa9892ee47417058336c6409e4c80657a4 100644
|
| --- a/third_party/mojo/src/mojo/edk/system/memory.h
|
| +++ b/third_party/mojo/src/mojo/edk/system/memory.h
|
| @@ -2,17 +2,17 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef MOJO_EDK_SYSTEM_MEMORY_H_
|
| -#define MOJO_EDK_SYSTEM_MEMORY_H_
|
| +#ifndef THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_MEMORY_H_
|
| +#define THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_MEMORY_H_
|
|
|
| #include <stddef.h>
|
| #include <stdint.h>
|
| #include <string.h> // For |memcpy()|.
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| -#include "mojo/edk/system/system_impl_export.h"
|
| #include "mojo/public/c/system/macros.h"
|
| #include "mojo/public/cpp/system/macros.h"
|
| +#include "third_party/mojo/src/mojo/edk/system/system_impl_export.h"
|
|
|
| namespace mojo {
|
| namespace system {
|
| @@ -374,4 +374,4 @@ class UserPointerReaderWriter {
|
| } // namespace system
|
| } // namespace mojo
|
|
|
| -#endif // MOJO_EDK_SYSTEM_MEMORY_H_
|
| +#endif // THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_MEMORY_H_
|
|
|