From a9fa50f723654c4e8b26909bb686eaa3721df155 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Tue, 10 Nov 2015 09:45:32 -0800 Subject: 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 . --- core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp | 9 +++++---- core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'core/src/fpdfapi/fpdf_cmaps/GB1') diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp b/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp index bf79ced6e6..4ddabbf870 100644 --- a/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp @@ -4,12 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../../include/fpdfapi/fpdf_resource.h" -#include "../../../../include/fpdfapi/fpdf_module.h" -#include "../../../../include/fxcrt/fx_basic.h" // For FX_ArraySize(). +#include "cmaps_gb1.h" + #include "../../fpdf_font/font_int.h" #include "../cmap_int.h" -#include "cmaps_gb1.h" +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_resource.h" +#include "core/include/fxcrt/fx_basic.h" // For FX_ArraySize(). static const FXCMAP_CMap g_FXCMAP_GB1_cmaps[] = { {"GB-EUC-H", FXCMAP_CMap::Range, g_FXCMAP_GB_EUC_H_0, 90, FXCMAP_CMap::None, diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h b/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h index c74ed71b06..beae68d382 100644 --- a/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h +++ b/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h @@ -7,7 +7,7 @@ #ifndef CORE_SRC_FPDFAPI_FPDF_CMAPS_GB1_CMAPS_GB1_H_ #define CORE_SRC_FPDFAPI_FPDF_CMAPS_GB1_CMAPS_GB1_H_ -#include "../../../../include/fxcrt/fx_system.h" // For FX_WORD. +#include "core/include/fxcrt/fx_system.h" // For FX_WORD. extern const FX_WORD g_FXCMAP_GB_EUC_H_0[]; extern const FX_WORD g_FXCMAP_GB_EUC_V_0[]; -- cgit v1.2.3