diff options
| author |  mtklein <mtklein@chromium.org> | 2015-02-17 13:10:43 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-02-17 13:10:43 -0800 |
| commit | 1e4e814c0396a2e1a283e2661c04e6b12eeb5265 (patch) | |
| tree | b6995f46605002c80c86cad1b2f8a468e34b4e88 /src/core/SkFlate.cpp | |
| parent | 9f2d1571ed1f0ed579e5d7779c46a90e20f30f22 (diff) | |
SK_NO_FLATE
Also remove skia_zlib_static. We're not using it. We don't even have zlib in DEPS.
No public API changes.
TBR=reed@google.com
BUG=skia:
Review URL: https://codereview.chromium.org/936583002
Diffstat (limited to 'src/core/SkFlate.cpp')
| -rw-r--r-- | src/core/SkFlate.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/core/SkFlate.cpp b/src/core/SkFlate.cpp index 2b4e36d727..ff11a11ca8 100644 --- a/src/core/SkFlate.cpp +++ b/src/core/SkFlate.cpp @@ -11,7 +11,7 @@ #include "SkFlate.h" #include "SkStream.h" -#ifndef SK_HAS_ZLIB +#ifdef SK_NO_FLATE bool SkFlate::HaveFlate() { return false; } bool SkFlate::Deflate(SkStream*, SkWStream*) { return false; } bool SkFlate::Deflate(const void*, size_t, SkWStream*) { return false; } @@ -26,11 +26,7 @@ bool SkFlate::HaveFlate() { namespace { -#ifdef SK_SYSTEM_ZLIB -#include <zlib.h> -#else -#include SK_ZLIB_INCLUDE -#endif +#include "zlib.h" // static const size_t kBufferSize = 1024; |