diff options
| author |  skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> | 2018-07-02 20:24:31 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-02 20:52:52 +0000 |
| commit | aae58023a88f9d914e5ef32e2af1262bebbc3d3c (patch) | |
| tree | 2437616b47dd407d92833337269c02c62bc14884 /third_party/skcms/skcms_internal.h | |
| parent | 9aa30c6ee0e5e2ba4ccc25a4913966a65f808f28 (diff) | |
Roll skia/third_party/skcms 0977edc92270..9d19e2abf000 (4 commits)
https://skia.googlesource.com/skcms.git/+log/0977edc92270..9d19e2abf000
2018-07-02 mtklein@chromium.org stop using designated initializers
2018-07-02 mtklein@chromium.org explicitly cast 16-bit constants to uint16_t
2018-07-02 mtklein@chromium.org fix typo in c++ header check
2018-07-02 mtklein@chromium.org make skcms buildable as c++
The AutoRoll server is located here: https://skcms-skia-roll.skia.org
Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md
If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel
TBR=ethannicholas@google.com
Change-Id: I5c9b29c5d8fcc3d8e3bf64ecd1ab24cac86b5d01
Reviewed-on: https://skia-review.googlesource.com/138954
Commit-Queue: skcms-skia-autoroll <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Reviewed-by: skcms-skia-autoroll <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Diffstat (limited to 'third_party/skcms/skcms_internal.h')
| -rw-r--r-- | third_party/skcms/skcms_internal.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/third_party/skcms/skcms_internal.h b/third_party/skcms/skcms_internal.h index d8fe695265..3e2fc2be82 100644 --- a/third_party/skcms/skcms_internal.h +++ b/third_party/skcms/skcms_internal.h @@ -14,7 +14,7 @@ #include <stdbool.h> #include <stdint.h> -#if defined(__cpluscplus) +#ifdef __cplusplus extern "C" { #endif @@ -46,6 +46,6 @@ extern "C" { static inline float fabsf_(float x) { return x < 0 ? -x : x; } float powf_(float, float); -#if defined(__cpluscplus) -} // extern "C" +#ifdef __cplusplus +} #endif |