core/src/fxcrt/fx_basic_memmgr.cpp - Issue 1438573002: Merge to XFA: Fix relative includes within core/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: core/src/fxcrt/fx_basic_memmgr.cpp

Issue 1438573002: Merge to XFA: Fix relative includes within core/ (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa

Patch Set: Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: core/src/fxcrt/fx_basic_memmgr.cpp

diff --git a/core/src/fxcrt/fx_basic_memmgr.cpp b/core/src/fxcrt/fx_basic_memmgr.cpp

index ebc25851f69198b4dae1d42710021bdb5178cce7..6665df60dac9cfe0d19c75eb70f47a647da7b32c 100644

--- a/core/src/fxcrt/fx_basic_memmgr.cpp

+++ b/core/src/fxcrt/fx_basic_memmgr.cpp

@@ -5,7 +5,8 @@

#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);

« no previous file with comments | « core/src/fxcrt/fx_basic_maps.cpp ('k') | core/src/fxcrt/fx_basic_memmgr_unittest.cpp » ('j') | no next file with comments »