aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar thakis <thakis@chromium.org>2015-10-15 10:52:23 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-10-15 10:52:23 -0700
commit41c054eeb0109c35cadaa90c546cbf954edcb3fe (patch)
treeb78bfca72d65d069ca26a7b698776bebaa0d8625
parent9617431dfe856ff50a4e4954262c8f526e128bb7 (diff)
Move an #include out of a namespace.
This is required to build Chromium's ui_base target with -fmodules, but it seems like a good change regardless. Including a header in a namespace is weird. BUG=chromium:543704 Review URL: https://codereview.chromium.org/1398843007
-rw-r--r--src/pdf/SkDeflate.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pdf/SkDeflate.cpp b/src/pdf/SkDeflate.cpp
index c52a4600c4..0a5b6f964a 100644
--- a/src/pdf/SkDeflate.cpp
+++ b/src/pdf/SkDeflate.cpp
@@ -11,14 +11,14 @@
#include "SkDeflate.h"
#include "SkStream.h"
-namespace {
-
#ifdef ZLIB_INCLUDE
#include ZLIB_INCLUDE
#else
#include "zlib.h"
#endif
+namespace {
+
// Different zlib implementations use different T.
// We've seen size_t and unsigned.
template <typename T> void* skia_alloc_func(void*, T items, T size) {