--- a/src/hotspot/share/utilities/macros.hpp Wed Apr 11 13:51:33 2018 +0200
+++ b/src/hotspot/share/utilities/macros.hpp Wed Apr 11 13:52:23 2018 +0200
@@ -109,11 +109,13 @@
#define CDS_ONLY(x) x
#define NOT_CDS(x)
#define NOT_CDS_RETURN /* next token must be ; */
+#define NOT_CDS_RETURN0 /* next token must be ; */
#define NOT_CDS_RETURN_(code) /* next token must be ; */
#else
#define CDS_ONLY(x)
#define NOT_CDS(x) x
-#define NOT_CDS_RETURN {}
+#define NOT_CDS_RETURN {}
+#define NOT_CDS_RETURN0 { return 0; }
#define NOT_CDS_RETURN_(code) { return code; }
#endif // INCLUDE_CDS