summaryrefslogtreecommitdiff
path: root/third_party/base
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2018-02-02 22:16:58 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-02-02 22:16:58 +0000
commit2e988749a1775ff85b14d6e93a52c931481e64d3 (patch)
treee7c0dfb70d636ca650b08f6a6fa5561277a5fabc /third_party/base
parentbbeb10daef8b485024aa68126ff267c81dd4c474 (diff)
downloadpdfium-2e988749a1775ff85b14d6e93a52c931481e64d3.tar.xz
Remove third_party/build/build_config.h.
Use build/build_config.h instead. Having two build_config.h files is confusing. Change-Id: I4bd9c76ab6d913ee0aaa8b2f9c17b94bfba2d128 Reviewed-on: https://pdfium-review.googlesource.com/25111 Commit-Queue: Lei Zhang <thestig@chromium.org> Reviewed-by: Chris Palmer <palmer@chromium.org> Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Diffstat (limited to 'third_party/base')
-rw-r--r--third_party/base/allocator/partition_allocator/address_space_randomization.cc2
-rw-r--r--third_party/base/allocator/partition_allocator/page_allocator.cc2
-rw-r--r--third_party/base/allocator/partition_allocator/page_allocator.h2
-rw-r--r--third_party/base/allocator/partition_allocator/partition_alloc.h2
-rw-r--r--third_party/base/sys_byteorder.h2
-rw-r--r--third_party/base/template_util.h2
6 files changed, 6 insertions, 6 deletions
diff --git a/third_party/base/allocator/partition_allocator/address_space_randomization.cc b/third_party/base/allocator/partition_allocator/address_space_randomization.cc
index 08f22be80a..d16970a7c9 100644
--- a/third_party/base/allocator/partition_allocator/address_space_randomization.cc
+++ b/third_party/base/allocator/partition_allocator/address_space_randomization.cc
@@ -4,9 +4,9 @@
#include "third_party/base/allocator/partition_allocator/address_space_randomization.h"
+#include "build/build_config.h"
#include "third_party/base/allocator/partition_allocator/page_allocator.h"
#include "third_party/base/allocator/partition_allocator/spin_lock.h"
-#include "third_party/build/build_config.h"
#if defined(OS_WIN)
#include <windows.h>
diff --git a/third_party/base/allocator/partition_allocator/page_allocator.cc b/third_party/base/allocator/partition_allocator/page_allocator.cc
index abe159b727..0869bdb769 100644
--- a/third_party/base/allocator/partition_allocator/page_allocator.cc
+++ b/third_party/base/allocator/partition_allocator/page_allocator.cc
@@ -8,10 +8,10 @@
#include <atomic>
+#include "build/build_config.h"
#include "third_party/base/allocator/partition_allocator/address_space_randomization.h"
#include "third_party/base/base_export.h"
#include "third_party/base/logging.h"
-#include "third_party/build/build_config.h"
#if defined(OS_POSIX)
diff --git a/third_party/base/allocator/partition_allocator/page_allocator.h b/third_party/base/allocator/partition_allocator/page_allocator.h
index aee2532485..bf9c0987a0 100644
--- a/third_party/base/allocator/partition_allocator/page_allocator.h
+++ b/third_party/base/allocator/partition_allocator/page_allocator.h
@@ -9,9 +9,9 @@
#include <cstddef>
+#include "build/build_config.h"
#include "third_party/base/base_export.h"
#include "third_party/base/compiler_specific.h"
-#include "third_party/build/build_config.h"
namespace pdfium {
namespace base {
diff --git a/third_party/base/allocator/partition_allocator/partition_alloc.h b/third_party/base/allocator/partition_allocator/partition_alloc.h
index 7e8415c760..87db329af2 100644
--- a/third_party/base/allocator/partition_allocator/partition_alloc.h
+++ b/third_party/base/allocator/partition_allocator/partition_alloc.h
@@ -62,13 +62,13 @@
#include <limits.h>
#include <string.h>
+#include "build/build_config.h"
#include "third_party/base/allocator/partition_allocator/page_allocator.h"
#include "third_party/base/allocator/partition_allocator/spin_lock.h"
#include "third_party/base/bits.h"
#include "third_party/base/compiler_specific.h"
#include "third_party/base/logging.h"
#include "third_party/base/sys_byteorder.h"
-#include "third_party/build/build_config.h"
#if defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
#include <stdlib.h>
diff --git a/third_party/base/sys_byteorder.h b/third_party/base/sys_byteorder.h
index 593abe17d4..db8cc165ba 100644
--- a/third_party/base/sys_byteorder.h
+++ b/third_party/base/sys_byteorder.h
@@ -13,8 +13,8 @@
#include <stdint.h>
+#include "build/build_config.h"
#include "third_party/base/logging.h"
-#include "third_party/build/build_config.h"
#if defined(COMPILER_MSVC)
#include <stdlib.h>
diff --git a/third_party/base/template_util.h b/third_party/base/template_util.h
index b2463225f8..0fed0cc259 100644
--- a/third_party/base/template_util.h
+++ b/third_party/base/template_util.h
@@ -10,7 +10,7 @@
#include <type_traits>
#include <utility>
-#include "third_party/build/build_config.h"
+#include "build/build_config.h"
// This hacks around libstdc++ 4.6 missing stuff in type_traits, while we need
// to support it.