diff options
| author |  reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2010-12-20 18:26:13 +0000 |
|---|---|---|
| committer | reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2010-12-20 18:26:13 +0000 |
| commit | f2b98d67dcb6fcb3120feede9c72016fc7b3ead8 (patch) | |
| tree | d78b57945b29865dcdeb1badbb360575289b292d /src/core/SkUtils.cpp | |
| parent | 29e5054dd07c97c2195c5f64bf67aaa6b5afa204 (diff) | |
merge with changes for GPU backend
git-svn-id: http://skia.googlecode.com/svn/trunk@637 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkUtils.cpp')
| -rw-r--r-- | src/core/SkUtils.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/SkUtils.cpp b/src/core/SkUtils.cpp index a88233f412..9fb85c2939 100644 --- a/src/core/SkUtils.cpp +++ b/src/core/SkUtils.cpp @@ -124,7 +124,7 @@ void sk_memset32_portable(uint32_t dst[], uint32_t value, int count) } } -#ifndef ANDROID +#if !defined(ANDROID) || defined(SK_BUILD_FOR_ANDROID_NDK) static void sk_memset16_stub(uint16_t dst[], uint16_t value, int count) { SkMemset16Proc proc = SkMemset16GetPlatformProc(); |