fpdfsdk/src/javascript/global.cpp - Issue 1439223003: Merge to XFA: Remove relative includes.

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/global.cpp

Issue 1439223003: Merge to XFA: Remove relative includes. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa

Patch Set: fix merge 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/global.cpp

diff --git a/fpdfsdk/src/javascript/global.cpp b/fpdfsdk/src/javascript/global.cpp

index f7c71e88b1b73c8f18ff69fc3c0711646c095f43..2d9799dd4e1ae54fb1265755a5fdf7b7973f9a4e 100644

--- a/fpdfsdk/src/javascript/global.cpp

+++ b/fpdfsdk/src/javascript/global.cpp

@@ -6,7 +6,6 @@

#include "global.h"

-#include "../../include/javascript/IJavaScript.h"

#include "JS_Context.h"

#include "JS_Define.h"

#include "JS_EventHandler.h"

@@ -14,6 +13,7 @@

#include "JS_Object.h"

#include "JS_Value.h"

#include "core/include/fxcrt/fx_ext.h"

+#include "fpdfsdk/include/javascript/IJavaScript.h"

#include "resource.h"

/* ---------------------------- global ---------------------------- */

« no previous file with comments | « fpdfsdk/src/javascript/event.cpp ('k') | fpdfsdk/src/javascript/report.cpp » ('j') | no next file with comments »