--- a/src/hotspot/share/runtime/globals.hpp	Mon Nov 06 20:29:49 2017 -0800
+++ b/src/hotspot/share/runtime/globals.hpp	Mon Nov 06 21:28:03 2017 -0800
@@ -99,11 +99,11 @@
 #define CI_COMPILER_COUNT 0
 #else
 
-#if defined(COMPILER2) || INCLUDE_JVMCI
+#if COMPILER2_OR_JVMCI
 #define CI_COMPILER_COUNT 2
 #else
 #define CI_COMPILER_COUNT 1
-#endif // COMPILER2 || INCLUDE_JVMCI
+#endif // COMPILER2_OR_JVMCI
 
 #endif // no compilers