fpdfsdk/src/fsdk_baseannot.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/fsdk_baseannot.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/fsdk_baseannot.cpp

diff --git a/fpdfsdk/src/fsdk_baseannot.cpp b/fpdfsdk/src/fsdk_baseannot.cpp

index 45f359a9d228cdcb893f3ce89779ec5c0b1d3134..090a50fe620105feebdc13b9d29ac6e4e2e14563 100644

--- a/fpdfsdk/src/fsdk_baseannot.cpp

+++ b/fpdfsdk/src/fsdk_baseannot.cpp

@@ -4,10 +4,10 @@

-#include "../include/fsdk_define.h"

#include "../include/fpdfxfa/fpdfxfa_doc.h"

-#include "../include/fsdk_mgr.h"

-#include "../include/fsdk_baseannot.h"

+#include "fpdfsdk/include/fsdk_baseannot.h"

+#include "fpdfsdk/include/fsdk_define.h"

+#include "fpdfsdk/include/fsdk_mgr.h"

int _gAfxGetTimeZoneInSeconds(FX_CHAR tzhour, uint8_t tzminute) {

return (int)tzhour * 3600 + (int)tzminute * (tzhour >= 0 ? 60 : -60);

« no previous file with comments | « fpdfsdk/src/fsdk_annothandler.cpp ('k') | fpdfsdk/src/fsdk_baseform.cpp » ('j') | no next file with comments »