Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Side by Side Diff: include/core/SkPreConfig.h

Issue 1036283002: Remove all code related to NaCl (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Rebase Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « include/core/SkPostConfig.h ('k') | include/views/SkOSWindow_NaCl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2006 The Android Open Source Project 3 * Copyright 2006 The Android Open Source Project
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 9
10 #ifndef SkPreConfig_DEFINED 10 #ifndef SkPreConfig_DEFINED
11 #define SkPreConfig_DEFINED 11 #define SkPreConfig_DEFINED
12 12
13 #ifdef WEBKIT_VERSION_MIN_REQUIRED 13 #ifdef WEBKIT_VERSION_MIN_REQUIRED
14 #include "config.h" 14 #include "config.h"
15 #endif 15 #endif
16 16
17 // Allows embedders that want to disable macros that take arguments to just 17 // Allows embedders that want to disable macros that take arguments to just
18 // define that symbol to be one of these 18 // define that symbol to be one of these
19 // 19 //
20 #define SK_NOTHING_ARG1(arg1) 20 #define SK_NOTHING_ARG1(arg1)
21 #define SK_NOTHING_ARG2(arg1, arg2) 21 #define SK_NOTHING_ARG2(arg1, arg2)
22 #define SK_NOTHING_ARG3(arg1, arg2, arg3) 22 #define SK_NOTHING_ARG3(arg1, arg2, arg3)
23 23
24 ////////////////////////////////////////////////////////////////////// 24 //////////////////////////////////////////////////////////////////////
25 25
26 #if !defined(SK_BUILD_FOR_ANDROID) && !defined(SK_BUILD_FOR_IOS) && !defined(SK_ BUILD_FOR_PALM) && !defined(SK_BUILD_FOR_WINCE) && !defined(SK_BUILD_FOR_WIN32) && !defined(SK_BUILD_FOR_UNIX) && !defined(SK_BUILD_FOR_MAC) && !defined(SK_BUIL D_FOR_SDL) && !defined(SK_BUILD_FOR_BREW) && !defined(SK_BUILD_FOR_NACL) 26 #if !defined(SK_BUILD_FOR_ANDROID) && !defined(SK_BUILD_FOR_IOS) && !defined(SK_ BUILD_FOR_PALM) && !defined(SK_BUILD_FOR_WINCE) && !defined(SK_BUILD_FOR_WIN32) && !defined(SK_BUILD_FOR_UNIX) && !defined(SK_BUILD_FOR_MAC) && !defined(SK_BUIL D_FOR_SDL) && !defined(SK_BUILD_FOR_BREW)
27 27
28 #ifdef __APPLE__ 28 #ifdef __APPLE__
29 #include "TargetConditionals.h" 29 #include "TargetConditionals.h"
30 #endif 30 #endif
31 31
32 #if defined(PALMOS_SDK_VERSION) 32 #if defined(PALMOS_SDK_VERSION)
33 #define SK_BUILD_FOR_PALM 33 #define SK_BUILD_FOR_PALM
34 #elif defined(UNDER_CE) 34 #elif defined(UNDER_CE)
35 #define SK_BUILD_FOR_WINCE 35 #define SK_BUILD_FOR_WINCE
36 #elif defined(WIN32) 36 #elif defined(WIN32)
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 * 262 *
263 * NOTE: Clang/ARM (r161757) does not support the 'optimize' attribute. 263 * NOTE: Clang/ARM (r161757) does not support the 'optimize' attribute.
264 */ 264 */
265 #if SK_HAS_ATTRIBUTE(optimize) 265 #if SK_HAS_ATTRIBUTE(optimize)
266 # define SK_ATTRIBUTE_OPTIMIZE_O1 __attribute__((optimize("O1"))) 266 # define SK_ATTRIBUTE_OPTIMIZE_O1 __attribute__((optimize("O1")))
267 #else 267 #else
268 # define SK_ATTRIBUTE_OPTIMIZE_O1 /* nothing */ 268 # define SK_ATTRIBUTE_OPTIMIZE_O1 /* nothing */
269 #endif 269 #endif
270 270
271 #endif 271 #endif
OLDNEW
« no previous file with comments | « include/core/SkPostConfig.h ('k') | include/views/SkOSWindow_NaCl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698