| commit | bb35999e8ca142978ab2c382d182148b2cc1b6da | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Mon May 04 16:40:38 2015 -0700 |
| committer | Dan Albert <danalbert@google.com> | Mon May 04 16:40:38 2015 -0700 |
| tree | 07417c133a35dd5e05abccf606293643013139b4 | |
| parent | 6ce2ac3257a0b24c5991eb48eea2efba9e1c5186 [diff] |
Add additional shielding against the ERROR macro. Including the logging header with ERROR defined will always be a problem, so check for it explicitly. Move the NOGDI define from logging.cpp to logging.h since the standard library headers might be including windows.h, pulling in ERROR. Change-Id: Ib426973d2f1840710c0bf0e0cfb2420d0d322e27