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

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

Issue 657183002: Don't use 'defined' in macro expansion. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 2 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/SkFloatingPoint.h ('k') | no next file » | 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 * Copyright 2006 The Android Open Source Project 2 * Copyright 2006 The Android Open Source Project
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #ifndef SkPostConfig_DEFINED 8 #ifndef SkPostConfig_DEFINED
9 #define SkPostConfig_DEFINED 9 #define SkPostConfig_DEFINED
10 10
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 #endif 119 #endif
120 120
121 /////////////////////////////////////////////////////////////////////////////// 121 ///////////////////////////////////////////////////////////////////////////////
122 122
123 /** 123 /**
124 * SK_ENABLE_INST_COUNT controlls printing how many reference counted objects 124 * SK_ENABLE_INST_COUNT controlls printing how many reference counted objects
125 * are still held on exit. 125 * are still held on exit.
126 * Defaults to 1 in DEBUG and 0 in RELEASE. 126 * Defaults to 1 in DEBUG and 0 in RELEASE.
127 */ 127 */
128 #ifndef SK_ENABLE_INST_COUNT 128 #ifndef SK_ENABLE_INST_COUNT
129 # ifdef SK_DEBUG
130 // Only enabled for static builds, because instance counting relies on static 129 // Only enabled for static builds, because instance counting relies on static
131 // variables in functions defined in header files. 130 // variables in functions defined in header files.
132 # define SK_ENABLE_INST_COUNT !defined(SKIA_DLL) 131 # if defined(SK_DEBUG) && !defined(SKIA_DLL)
132 # define SK_ENABLE_INST_COUNT 1
133 # else 133 # else
134 # define SK_ENABLE_INST_COUNT 0 134 # define SK_ENABLE_INST_COUNT 0
135 # endif 135 # endif
136 #endif 136 #endif
137 137
138 /////////////////////////////////////////////////////////////////////////////// 138 ///////////////////////////////////////////////////////////////////////////////
139 139
140 #ifdef SK_BUILD_FOR_WIN 140 #ifdef SK_BUILD_FOR_WIN
141 # ifndef WIN32_LEAN_AND_MEAN 141 # ifndef WIN32_LEAN_AND_MEAN
142 # define WIN32_LEAN_AND_MEAN 142 # define WIN32_LEAN_AND_MEAN
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 425
426 #if defined(SK_GAMMA_EXPONENT) && defined(SK_GAMMA_SRGB) 426 #if defined(SK_GAMMA_EXPONENT) && defined(SK_GAMMA_SRGB)
427 # error "cannot define both SK_GAMMA_EXPONENT and SK_GAMMA_SRGB" 427 # error "cannot define both SK_GAMMA_EXPONENT and SK_GAMMA_SRGB"
428 #elif defined(SK_GAMMA_SRGB) 428 #elif defined(SK_GAMMA_SRGB)
429 # define SK_GAMMA_EXPONENT (0.0f) 429 # define SK_GAMMA_EXPONENT (0.0f)
430 #elif !defined(SK_GAMMA_EXPONENT) 430 #elif !defined(SK_GAMMA_EXPONENT)
431 # define SK_GAMMA_EXPONENT (2.2f) 431 # define SK_GAMMA_EXPONENT (2.2f)
432 #endif 432 #endif
433 433
434 #endif // SkPostConfig_DEFINED 434 #endif // SkPostConfig_DEFINED
OLDNEW
« no previous file with comments | « include/core/SkFloatingPoint.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698