diff options
| -rw-r--r-- | PRESUBMIT.py | 1 | ||||
| -rw-r--r-- | skia/ext/platform_device.h | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/PRESUBMIT.py b/PRESUBMIT.py index c593b16..6feebd0 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -179,7 +179,6 @@ _VALID_OS_MACROS = ( 'OS_OPENBSD', 'OS_POSIX', 'OS_SOLARIS', - 'OS_SUN', # Not in build/build_config.h but in skia. 'OS_WIN', ) diff --git a/skia/ext/platform_device.h b/skia/ext/platform_device.h index 69efb3f..4ac3aee 100644 --- a/skia/ext/platform_device.h +++ b/skia/ext/platform_device.h @@ -22,7 +22,7 @@ class SkPath; class SkRegion; #if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_FREEBSD) \ - || defined(OS_SUN) + || defined(OS_SOLARIS) typedef struct _cairo cairo_t; typedef struct _cairo_rectangle cairo_rectangle_t; #elif defined(OS_MACOSX) @@ -41,7 +41,7 @@ typedef RECT PlatformRect; typedef void* PlatformSurface; typedef SkIRect* PlatformRect; #elif defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_FREEBSD) \ - || defined(OS_SUN) + || defined(OS_SOLARIS) typedef cairo_t* PlatformSurface; typedef cairo_rectangle_t PlatformRect; #elif defined(OS_MACOSX) |