summaryrefslogtreecommitdiff
path: root/core/include
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2016-01-26 14:36:36 -0800
committerTom Sepez <tsepez@chromium.org>2016-01-26 14:36:36 -0800
commitc812495631df9f059bfd332ffe37e76dd011e96c (patch)
tree9388f751f310faa72f8f336932b4c5dce885316f /core/include
parentf10ae634e7b198b18942baaf9f111f07cc8ce818 (diff)
downloadpdfium-c812495631df9f059bfd332ffe37e76dd011e96c.tar.xz
Fix collison with Windows #define RGB macro.
kGray and such are much safer. TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1638093002 .
Diffstat (limited to 'core/include')
-rw-r--r--core/include/fpdfdoc/fpdf_ap.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/include/fpdfdoc/fpdf_ap.h b/core/include/fpdfdoc/fpdf_ap.h
index dddbb6e0df..510b39cb9b 100644
--- a/core/include/fpdfdoc/fpdf_ap.h
+++ b/core/include/fpdfdoc/fpdf_ap.h
@@ -27,9 +27,9 @@ struct CPVT_Dash {
};
struct CPVT_Color {
- enum Type { TRANSPARENT = 0, GRAY, RGB, CMYK };
+ enum Type { kTransparent = 0, kGray, kRGB, kCMYK };
- CPVT_Color(Type type = TRANSPARENT,
+ CPVT_Color(Type type = kTransparent,
FX_FLOAT color1 = 0.0f,
FX_FLOAT color2 = 0.0f,
FX_FLOAT color3 = 0.0f,