diff options
| author |  tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-07-01 17:08:26 +0000 |
|---|---|---|
| committer | tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-07-01 17:08:26 +0000 |
| commit | 0c8d93a94099dee2dff8da6000ded9ad59676488 (patch) | |
| tree | 93d68d568132740aef280b4badcf5edb90ce8b7f /include/config/SkUserConfig.h | |
| parent | 9ae4429f9d3ab837ff9352261271974715cabb8a (diff) | |
Reworks r1770 so that users who have replaced SkUserConfig don't have to
make any changes to continue compiling successfully.
git-svn-id: http://skia.googlecode.com/svn/trunk@1779 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/config/SkUserConfig.h')
| -rw-r--r-- | include/config/SkUserConfig.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/config/SkUserConfig.h b/include/config/SkUserConfig.h index 6ee514646b..48f6379a03 100644 --- a/include/config/SkUserConfig.h +++ b/include/config/SkUserConfig.h @@ -148,17 +148,17 @@ //#define SK_SUPPORT_UNITTEST #endif -/* If your system embeds skia and has complex event logging, redefine this - symbol to point to a file that maps the following macros to your system's +/* If your system embeds skia and has complex event logging, define this + symbol to name a file that maps the following macros to your system's equivalents: SK_TRACE_EVENT0(event) SK_TRACE_EVENT1(event, name1, value1) SK_TRACE_EVENT2(event, name1, value1, name2, value2) - include/config/SkUserTrace.h has a no-op implementation, while src/utils/SkDebugTrace.h has a trivial implementation that writes to - the debug output stream. + the debug output stream. If SK_USER_TRACE_INCLUDE_FILE is not defined, + SkTrace.h will define the above three macros to do nothing. */ -#define SK_USER_TRACE_INCLUDE_FILE "../../include/config/SkUserTrace.h" +//#undef SK_USER_TRACE_INCLUDE_FILE /* Change the ordering to work in X windows. */ |