diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-11-10 09:45:32 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-11-10 09:45:32 -0800 |
| commit | a9fa50f723654c4e8b26909bb686eaa3721df155 (patch) | |
| tree | dc6b8bc03ed574872a84120d482ab7196ec1cc54 /core/src/fxcrt/fx_basic_memmgr.cpp | |
| parent | d88a364c1c79b294b980c20ebc9356ea42635bff (diff) | |
| download | pdfium-a9fa50f723654c4e8b26909bb686eaa3721df155.tar.xz | |
Merge to XFA: Fix relative includes within core/
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1427633010 .
(cherry picked from commit 9fb27cb9797937499c9678bc74cf7846cbf5d2b8)
Review URL: https://codereview.chromium.org/1438573002 .
Diffstat (limited to 'core/src/fxcrt/fx_basic_memmgr.cpp')
| -rw-r--r-- | core/src/fxcrt/fx_basic_memmgr.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/src/fxcrt/fx_basic_memmgr.cpp b/core/src/fxcrt/fx_basic_memmgr.cpp index ebc25851f6..6665df60da 100644 --- a/core/src/fxcrt/fx_basic_memmgr.cpp +++ b/core/src/fxcrt/fx_basic_memmgr.cpp @@ -5,7 +5,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include <stdlib.h> // For abort(). -#include "../../include/fxcrt/fx_memory.h" + +#include "core/include/fxcrt/fx_memory.h" void* FXMEM_DefaultAlloc(size_t byte_size, int flags) { return (void*)malloc(byte_size); |