summaryrefslogtreecommitdiff
path: root/core/src/fxcrt
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-06-04 19:05:21 -0700
committerTom Sepez <tsepez@chromium.org>2015-06-04 19:05:21 -0700
commit6675a80c6afe3652b7bd918b80a16a8effb51b8f (patch)
tree869efaae9312c11bb8f2fb7c707690a3fa468708 /core/src/fxcrt
parent76510e4127dc938d121ac5026000f3b0d84a2d46 (diff)
downloadpdfium-6675a80c6afe3652b7bd918b80a16a8effb51b8f.tar.xz
Merge to XFA: Move fx_safe_types.h to include/ directory.
Original Review URL: https://codereview.chromium.org/1147353006 TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1152693005
Diffstat (limited to 'core/src/fxcrt')
-rw-r--r--core/src/fxcrt/extension.h2
-rw-r--r--core/src/fxcrt/fx_safe_types.h17
2 files changed, 1 insertions, 18 deletions
diff --git a/core/src/fxcrt/extension.h b/core/src/fxcrt/extension.h
index 8d02e329ad..0f37bbfefc 100644
--- a/core/src/fxcrt/extension.h
+++ b/core/src/fxcrt/extension.h
@@ -7,7 +7,7 @@
#ifndef CORE_SRC_FXCRT_EXTENSION_H_
#define CORE_SRC_FXCRT_EXTENSION_H_
-#include "fx_safe_types.h"
+#include "../../include/fxcrt/fx_safe_types.h"
class IFXCRT_FileAccess
{
diff --git a/core/src/fxcrt/fx_safe_types.h b/core/src/fxcrt/fx_safe_types.h
deleted file mode 100644
index 35a906cf27..0000000000
--- a/core/src/fxcrt/fx_safe_types.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// 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.
-
-#ifndef CORE_SRC_FXCRT_FX_SAFE_TYPES_H_
-#define CORE_SRC_FXCRT_FX_SAFE_TYPES_H_
-
-#include <stdlib.h> // For size_t.
-
-#include "../../../third_party/base/numerics/safe_math.h"
-
-typedef pdfium::base::CheckedNumeric<FX_DWORD> FX_SAFE_DWORD;
-typedef pdfium::base::CheckedNumeric<FX_INT32> FX_SAFE_INT32;
-typedef pdfium::base::CheckedNumeric<size_t> FX_SAFE_SIZE_T;
-typedef pdfium::base::CheckedNumeric<FX_FILESIZE> FX_SAFE_FILESIZE;
-
-#endif // CORE_SRC_FXCRT_FX_SAFE_TYPES_H_