diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-11-05 18:39:40 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-11-05 18:39:40 -0800 |
| commit | 34bb6c58fe60206a08dc0a1f37b7cfe83e8c762c (patch) | |
| tree | 422e979cbfdeab9781c07a4040aee94a9dd0a7f6 /core/include/fxcrt | |
| parent | ba2d95fb6d7b6eb3b27ca8e6eb41d9aae1a8b691 (diff) | |
| download | pdfium-34bb6c58fe60206a08dc0a1f37b7cfe83e8c762c.tar.xz | |
Fix all relative includes to third_party.chromium/2560chromium/2559chromium/2558chromium/2557
- In non-standalone builds, use the provided jpeg library.
- Run gn format over all the GN files.
- Also roll DEPS for buildtools to c2f2598.
BUG=541704
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1425153006 .
Diffstat (limited to 'core/include/fxcrt')
| -rw-r--r-- | core/include/fxcrt/fx_safe_types.h | 2 | ||||
| -rw-r--r-- | core/include/fxcrt/fx_system.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/include/fxcrt/fx_safe_types.h b/core/include/fxcrt/fx_safe_types.h index ee50a53e34..d10bdbeb1a 100644 --- a/core/include/fxcrt/fx_safe_types.h +++ b/core/include/fxcrt/fx_safe_types.h @@ -7,9 +7,9 @@ #include <stdlib.h> // For size_t. -#include "../../../third_party/base/numerics/safe_math.h" #include "fx_stream.h" // for FX_FILESIZE. #include "fx_system.h" +#include "third_party/base/numerics/safe_math.h" typedef pdfium::base::CheckedNumeric<FX_DWORD> FX_SAFE_DWORD; typedef pdfium::base::CheckedNumeric<int32_t> FX_SAFE_INT32; diff --git a/core/include/fxcrt/fx_system.h b/core/include/fxcrt/fx_system.h index 53789581d7..5fe3453626 100644 --- a/core/include/fxcrt/fx_system.h +++ b/core/include/fxcrt/fx_system.h @@ -160,7 +160,7 @@ FXSYS_FILE* FXSYS_wfopen(const FX_WCHAR* filename, const FX_WCHAR* mode); #ifdef __cplusplus } // extern "C" -#include "../../../third_party/base/numerics/safe_conversions.h" +#include "third_party/base/numerics/safe_conversions.h" #define FXSYS_strlen(ptr) pdfium::base::checked_cast<FX_STRSIZE>(strlen(ptr)) #define FXSYS_wcslen(ptr) pdfium::base::checked_cast<FX_STRSIZE>(wcslen(ptr)) extern "C" { |