Version 2.14.0-196.0.dev
Merge commit '70ee62e55fdb01af38b9d3f628cd096dc6195784' into 'dev'
diff --git a/runtime/platform/globals.h b/runtime/platform/globals.h
index 52201dc..cc8eec1 100644
--- a/runtime/platform/globals.h
+++ b/runtime/platform/globals.h
@@ -15,19 +15,17 @@
#define FALL_THROUGH ((void)0)
#endif
+#if !defined(NDEBUG) && !defined(DEBUG)
#if defined(GOOGLE3)
// google3 builds use NDEBUG to indicate non-debug builds which is different
// from the way the Dart project expects it: DEBUG indicating a debug build.
-#if !defined(NDEBUG) && !defined(DEBUG)
#define DEBUG
-#endif // !NDEBUG && !DEBUG \
#else
// Since <cassert> uses NDEBUG to signify that assert() macros should be turned
// off, we'll define it when DEBUG is _not_ set.
-#if !defined(DEBUG)
#define NDEBUG
-#endif
#endif // GOOGLE3
+#endif // !NDEBUG && !DEBUG
// __STDC_FORMAT_MACROS has to be defined before including <inttypes.h> to
// enable platform independent printf format specifiers.
diff --git a/tools/VERSION b/tools/VERSION
index b0fb44a..17c91f5 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
MAJOR 2
MINOR 14
PATCH 0
-PRERELEASE 195
+PRERELEASE 196
PRERELEASE_PATCH 0
\ No newline at end of file
