fpdfsdk/src/javascript/JS_Object.h - Issue 1434543003: Merge to XFA: Fix all relative includes to third_party.

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: fpdfsdk/src/javascript/JS_Object.h

Issue 1434543003: Merge to XFA: Fix all relative includes to third_party. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa

Patch Set: fix merge, attempt 1 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: fpdfsdk/src/javascript/JS_Object.h

diff --git a/fpdfsdk/src/javascript/JS_Object.h b/fpdfsdk/src/javascript/JS_Object.h

index 50751523f50b5c247925d50ca0349e6f58a237b4..8872a4eca42df69f2d1d107bafd427f62541a452 100644

--- a/fpdfsdk/src/javascript/JS_Object.h

+++ b/fpdfsdk/src/javascript/JS_Object.h

@@ -9,10 +9,10 @@

#include <map>

-#include "../../../third_party/base/nonstd_unique_ptr.h"

#include "../../include/fsdk_define.h" // For FX_UINT

#include "../../include/jsapi/fxjs_v8.h"

#include "JS_Runtime.h"

+#include "third_party/base/nonstd_unique_ptr.h"

class CJS_Context;

class CJS_Object;