summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-05-27 16:24:18 -0700
committerTom Sepez <tsepez@chromium.org>2015-05-27 16:24:18 -0700
commit04db653b2b4c266036fbd274b53f0763e35f4ee6 (patch)
treee0b95fc7f675f05a4ab53e941de130a8b3d15b7a /core
parentbdeeb8a036442302b821686a03698b0bb98952e1 (diff)
downloadpdfium-04db653b2b4c266036fbd274b53f0763e35f4ee6.tar.xz
Merge to XFA: Remove rendundant ../include from paths.
Original Review URL: https://codereview.chromium.org/1162453003 TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1154613005
Diffstat (limited to 'core')
-rw-r--r--core/include/fdrm/fx_crypt.h14
-rw-r--r--core/include/fpdfapi/fpdfapi.h12
-rw-r--r--core/include/fxge/fx_font.h15
3 files changed, 24 insertions, 17 deletions
diff --git a/core/include/fdrm/fx_crypt.h b/core/include/fdrm/fx_crypt.h
index ec7d55ab8c..adbdf8fa23 100644
--- a/core/include/fdrm/fx_crypt.h
+++ b/core/include/fdrm/fx_crypt.h
@@ -1,14 +1,18 @@
// Copyright 2014 PDFium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-
+
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FX_CRYPT_H_
-#define _FX_CRYPT_H_
+#ifndef FX_CRYPT_H_
+#define FX_CRYPT_H_
+
+#include "../fxcrt/fx_basic.h"
+
#ifdef __cplusplus
extern "C" {
#endif
+
void CRYPT_ArcFourCryptBlock(FX_LPBYTE data, FX_DWORD size, FX_LPCBYTE key, FX_DWORD keylen);
void CRYPT_ArcFourSetup(FX_LPVOID context, FX_LPCBYTE key, FX_DWORD length);
void CRYPT_ArcFourCrypt(FX_LPVOID context, FX_LPBYTE data, FX_DWORD size);
@@ -37,7 +41,9 @@ void CRYPT_SHA512Update(FX_LPVOID context, FX_LPCBYTE data, FX_DWORD size);
void CRYPT_SHA512Finish(FX_LPVOID context, FX_BYTE digest[64]);
void CRYPT_SHA512Generate(FX_LPCBYTE data, FX_DWORD size, FX_BYTE digest[64]);
void CRYPT_SetPubKeyDecryptor(FX_BOOL (*func)(FX_LPCBYTE pData, FX_DWORD size, FX_LPBYTE data_buf, FX_DWORD& data_len));
+
#ifdef __cplusplus
};
#endif
-#endif
+
+#endif // FX_CRYPT_H_
diff --git a/core/include/fpdfapi/fpdfapi.h b/core/include/fpdfapi/fpdfapi.h
index 9407735267..a2f715d71b 100644
--- a/core/include/fpdfapi/fpdfapi.h
+++ b/core/include/fpdfapi/fpdfapi.h
@@ -4,12 +4,14 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FPDFAPI_H_
-#define _FPDFAPI_H_
-#include "../../include/fxcrt/fx_basic.h"
-#include "../../include/fxge/fx_ge.h"
+#ifndef FPDFAPI_H_
+#define FPDFAPI_H_
+
+#include "../fxcrt/fx_basic.h"
+#include "../fxge/fx_ge.h"
#include "fpdf_module.h"
#include "fpdf_pageobj.h"
#include "fpdf_render.h"
#include "fpdf_serial.h"
-#endif
+
+#endif // FPDFAPI_H_
diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h
index 5cf6b38a03..adf7e6251c 100644
--- a/core/include/fxge/fx_font.h
+++ b/core/include/fxge/fx_font.h
@@ -4,14 +4,12 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FX_FONT_H_
-#define _FX_FONT_H_
-#ifndef _FXCRT_EXTENSION_
-#include "../../include/fxcrt/fx_ext.h"
-#endif
-#ifndef _FX_DIB_H_
+#ifndef FX_FONT_H_
+#define FX_FONT_H_
+
+#include "../fxcrt/fx_ext.h"
#include "fx_dib.h"
-#endif
+
typedef struct FT_FaceRec_* FXFT_Face;
typedef void* FXFT_Library;
class IFX_FontEncoding;
@@ -474,4 +472,5 @@ protected:
~IFX_GSUBTable() { }
};
IFX_GSUBTable* FXGE_CreateGSUBTable(CFX_Font* pFont);
-#endif
+
+#endif // FX_FONT_H_