diff options
| author |  scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-18 19:55:57 +0000 |
|---|---|---|
| committer | scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-18 19:55:57 +0000 |
| commit | a6c76db94c37df7449afe6406d5263b528fa7ccd (patch) | |
| tree | 9df2c570d89812cfc3a1951c03ae4991c6c2e144 /src/animator | |
| parent | 1311f7e7f43d00cd1fa6802a414e987e60e6d67d (diff) | |
Do not use SkTDS32Array when building for 64 bit.
This class is used for pointers, which won't work on 64 bit.
Fixes SampleApp on Mac debug 64 bit.
BUG=https://code.google.com/p/skia/issues/detail?id=1169
Review URL: https://codereview.chromium.org/12919014
git-svn-id: http://skia.googlecode.com/svn/trunk@8203 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/animator')
| -rw-r--r-- | src/animator/SkTDArray_Experimental.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/animator/SkTDArray_Experimental.h b/src/animator/SkTDArray_Experimental.h index 094d106bb6..4b3970fde0 100644 --- a/src/animator/SkTDArray_Experimental.h +++ b/src/animator/SkTDArray_Experimental.h @@ -16,7 +16,7 @@ #define SK_BUILD_FOR_ADS_12 #endif -#ifndef SK_BUILD_FOR_ADS_12 +#if !defined(SK_BUILD_FOR_ADS_12) && !defined(__x86_64__) #define SK_SMALLER_ARRAY_TEMPLATE_EXPERIMENT 1 #else #define SK_SMALLER_ARRAY_TEMPLATE_EXPERIMENT 0 @@ -135,7 +135,7 @@ private: }; #define SkIntArray(type) SkTDS32Array<type> // holds 32 bit data types -#define SkLongArray(type) SkTDS32Array<type> // holds 32/64 bit data types depending on pointer size +#define SkLongArray(type) SkTDS32Array<type> #endif // SK_SMALLER_ARRAY_TEMPLATE_EXPERIMENT |