commit | 2f638c0ca3a82e2711a9894fc2f92472b6c29c17 | [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 | 25490f1f03e54f77773acf3482d3675f3786ba40 | |
parent | eebcd14266f31e121f6d42fad542dc47a5c1ba8c [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