summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/fxcrt/fx_memory.cpp (renamed from core/fxcrt/fx_basic_memmgr.cpp)4
-rw-r--r--core/fxcrt/fx_memory_unittest.cpp (renamed from core/fxcrt/fx_basic_memmgr_unittest.cpp)3
2 files changed, 4 insertions, 3 deletions
diff --git a/core/fxcrt/fx_basic_memmgr.cpp b/core/fxcrt/fx_memory.cpp
index 75bc2bc1f1..2807139aa2 100644
--- a/core/fxcrt/fx_basic_memmgr.cpp
+++ b/core/fxcrt/fx_memory.cpp
@@ -4,10 +4,10 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include <stdlib.h> // For abort().
-
#include "core/fxcrt/fx_memory.h"
+#include <stdlib.h> // For abort().
+
pdfium::base::PartitionAllocatorGeneric gArrayBufferPartitionAllocator;
pdfium::base::PartitionAllocatorGeneric gStringPartitionAllocator;
diff --git a/core/fxcrt/fx_basic_memmgr_unittest.cpp b/core/fxcrt/fx_memory_unittest.cpp
index fdffd98f19..ae15db2a72 100644
--- a/core/fxcrt/fx_basic_memmgr_unittest.cpp
+++ b/core/fxcrt/fx_memory_unittest.cpp
@@ -2,9 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "core/fxcrt/fx_memory.h"
+
#include <limits>
-#include "core/fxcrt/fx_memory.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {