summaryrefslogtreecommitdiff
path: root/third_party/base/logging.h
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-12-09 14:55:41 -0800
committerTom Sepez <tsepez@chromium.org>2015-12-09 14:55:41 -0800
commit465ed873abc829e9dda39f30c8679d2d18721f62 (patch)
tree1d6887fa4c350810a06a06b4b0df2513f42e20cf /third_party/base/logging.h
parent35e68a5275f2d1e6819c773f0f367e225a0d5961 (diff)
downloadpdfium-465ed873abc829e9dda39f30c8679d2d18721f62.tar.xz
XFA: Fix win8 gn build under chromium checkout (non-xfa)
The no nominmax config was lost when moving from master. Fix a few other small differences along the way, and fully conditionalize the build of tiff. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1514633002 .
Diffstat (limited to 'third_party/base/logging.h')
-rw-r--r--third_party/base/logging.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/third_party/base/logging.h b/third_party/base/logging.h
index d24f93b2a1..98ed9c5da0 100644
--- a/third_party/base/logging.h
+++ b/third_party/base/logging.h
@@ -5,6 +5,7 @@
#ifndef PDFIUM_THIRD_PARTY_BASE_LOGGING_H_
#define PDFIUM_THIRD_PARTY_BASE_LOGGING_H_
+#include <assert.h>
#include <stdlib.h>
#define CHECK(condition) \
@@ -13,6 +14,6 @@
*(reinterpret_cast<volatile char*>(NULL) + 42) = 0x42; \
}
-#define NOTREACHED() abort()
+#define NOTREACHED() assert(false)
#endif // PDFIUM_THIRD_PARTY_BASE_LOGGING_H_