diff options
| author |  bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-11 18:50:45 +0000 |
|---|---|---|
| committer | bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-11 18:50:45 +0000 |
| commit | fab44db294846ff05d837b9cf0bf97a073891da7 (patch) | |
| tree | 76bba06175f7c85f25c22779149e1355f9bd1f9c /include | |
| parent | dcb4e65998913bfb2cc7e331ffacf0965bdee0ea (diff) | |
Clean up SkTypes.h.
This change removes sk_stdint.h since it is only needed for vs2008 and earlier.
This change removes SK_MMAP_SUPPORT define since it is no longer used.
This change removes the stdio.h include from SkTypes.h since on many systems
this is a very large header, few Skia files actually use it, it is
available everywhere standard, and SkDebugf should be used instead.
After this change there is no need for external users to put Skia's
include/config into their own list of includes, saving the headache
of having two header files of the same name and sometimes getting the
wrong one depending on include order.
R=bsalomon@google.com, djsollen@google.com
Review URL: https://codereview.chromium.org/27044002
git-svn-id: http://skia.googlecode.com/svn/trunk@11738 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
| -rw-r--r-- | include/config/sk_stdint.h | 23 | ||||
| -rw-r--r-- | include/core/SkPreConfig.h | 12 | ||||
| -rw-r--r-- | include/core/SkStream.h | 1 | ||||
| -rw-r--r-- | include/core/SkTypes.h | 7 |
4 files changed, 2 insertions, 41 deletions
diff --git a/include/config/sk_stdint.h b/include/config/sk_stdint.h deleted file mode 100644 index 360755e75b..0000000000 --- a/include/config/sk_stdint.h +++ /dev/null @@ -1,23 +0,0 @@ - -/* - * Copyright 2011 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ -#ifndef sk_stdint_DEFINED -#define sk_stdint_DEFINED - -typedef signed char int8_t; -typedef unsigned char uint8_t; -typedef short int16_t; -typedef unsigned short uint16_t; -typedef int int32_t; -typedef unsigned uint32_t; -typedef long long int64_t; -typedef unsigned long long uint64_t; - -typedef int64_t intmax_t; -typedef uint64_t uintmax_t; - -#endif diff --git a/include/core/SkPreConfig.h b/include/core/SkPreConfig.h index 618b0a7870..db40f695b0 100644 --- a/include/core/SkPreConfig.h +++ b/include/core/SkPreConfig.h @@ -70,7 +70,6 @@ #if !defined(SK_WARN_UNUSED_RESULT) #define SK_WARN_UNUSED_RESULT #endif - #include "sk_stdint.h" #endif ////////////////////////////////////////////////////////////////////// @@ -102,17 +101,6 @@ ////////////////////////////////////////////////////////////////////// -#ifndef SK_MMAP_SUPPORT - #ifdef SK_BUILD_FOR_WIN32 - // by default, if we're windows, we assume we don't have mmap - #define SK_MMAP_SUPPORT 0 - #else - #define SK_MMAP_SUPPORT 1 - #endif -#endif - -////////////////////////////////////////////////////////////////////// - /** * SK_CPU_SSE_LEVEL * diff --git a/include/core/SkStream.h b/include/core/SkStream.h index 27f8ead141..69a038cd57 100644 --- a/include/core/SkStream.h +++ b/include/core/SkStream.h @@ -238,6 +238,7 @@ public: //////////////////////////////////////////////////////////////////////////////////////// #include "SkString.h" +#include <stdio.h> struct SkFILE; diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h index f2245184e6..219e51fbe9 100644 --- a/include/core/SkTypes.h +++ b/include/core/SkTypes.h @@ -13,12 +13,7 @@ #include "SkPreConfig.h" #include "SkUserConfig.h" #include "SkPostConfig.h" - -#ifndef SK_IGNORE_STDINT_DOT_H - #include <stdint.h> -#endif - -#include <stdio.h> +#include <stdint.h> /** \file SkTypes.h */ |