diff options
| author |  Ben Wagner <bungeman@google.com> | 2018-06-15 13:58:41 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-15 20:32:05 +0000 |
| commit | 29f2eaf6e51593038effe18cdcf6577b7dd24a5b (patch) | |
| tree | 32c243a4e4a159c64d09fc387d21a1cb061f4e2e | |
| parent | 08a50e02dba37427e7d479d2222b08259d226d50 (diff) | |
Remove string.h from SkTypes.h
Change-Id: I2be84f37ea11a386206a96d2fef6e0fc9464e21b
Reviewed-on: https://skia-review.googlesource.com/135264
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
| -rw-r--r-- | include/core/SkMatrix44.h | 5 | ||||
| -rw-r--r-- | include/core/SkTypes.h | 1 | ||||
| -rw-r--r-- | include/gpu/gl/GrGLFunctions.h | 2 | ||||
| -rw-r--r-- | include/private/SkFloatingPoint.h | 2 | ||||
| -rw-r--r-- | src/effects/SkPackBits.cpp | 3 | ||||
| -rw-r--r-- | src/gpu/GrAutoLocaleSetter.h | 1 |
6 files changed, 10 insertions, 4 deletions
diff --git a/include/core/SkMatrix44.h b/include/core/SkMatrix44.h index 12004ef7d6..ab8c6162b4 100644 --- a/include/core/SkMatrix44.h +++ b/include/core/SkMatrix44.h @@ -8,11 +8,12 @@ #ifndef SkMatrix44_DEFINED #define SkMatrix44_DEFINED -#include <atomic> - #include "SkMatrix.h" #include "SkScalar.h" +#include <atomic> +#include <cstring> + #ifdef SK_MSCALAR_IS_DOUBLE #ifdef SK_MSCALAR_IS_FLOAT #error "can't define MSCALAR both as DOUBLE and FLOAT" diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h index e624d4518c..262002bbda 100644 --- a/include/core/SkTypes.h +++ b/include/core/SkTypes.h @@ -16,7 +16,6 @@ #include <stdint.h> // IWYU pragma: end_exports -#include <string.h> #include <utility> /** \file SkTypes.h diff --git a/include/gpu/gl/GrGLFunctions.h b/include/gpu/gl/GrGLFunctions.h index af1b9f79cd..e0bc39015f 100644 --- a/include/gpu/gl/GrGLFunctions.h +++ b/include/gpu/gl/GrGLFunctions.h @@ -12,6 +12,8 @@ #include "GrGLTypes.h" #include "../private/SkTLogic.h" +#include <cstring> + extern "C" { /////////////////////////////////////////////////////////////////////////////// diff --git a/include/private/SkFloatingPoint.h b/include/private/SkFloatingPoint.h index 8fe4cb404e..d3ebdc26e2 100644 --- a/include/private/SkFloatingPoint.h +++ b/include/private/SkFloatingPoint.h @@ -13,6 +13,8 @@ #include "SkSafe_math.h" #include <float.h> #include <math.h> +#include <cstring> + #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1 #include <xmmintrin.h> diff --git a/src/effects/SkPackBits.cpp b/src/effects/SkPackBits.cpp index e46590956c..a9e61c4f2b 100644 --- a/src/effects/SkPackBits.cpp +++ b/src/effects/SkPackBits.cpp @@ -6,9 +6,10 @@ */ #include "SkPackBits.h" - #include "SkTo.h" +#include <cstring> + size_t SkPackBits::ComputeMaxSize8(size_t srcSize) { // worst case is the number of 8bit values + 1 byte per (up to) 128 entries. return ((srcSize + 127) >> 7) + srcSize; diff --git a/src/gpu/GrAutoLocaleSetter.h b/src/gpu/GrAutoLocaleSetter.h index c373b78e97..8c7d9d4ab3 100644 --- a/src/gpu/GrAutoLocaleSetter.h +++ b/src/gpu/GrAutoLocaleSetter.h @@ -20,6 +20,7 @@ #if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS) #include <xlocale.h> +#include <cstring> #define HAVE_XLOCALE 1 #else #define HAVE_XLOCALE 0 |