--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/share/mlvmJvmtiUtils.cpp	Mon Sep 17 15:25:42 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/share/mlvmJvmtiUtils.cpp	Mon Sep 17 19:36:09 2018 -0700
@@ -30,9 +30,7 @@
 #include "jvmti_tools.h"
 #include "mlvmJvmtiUtils.h"
 
-#ifdef __cplusplus
 extern "C" {
-#endif
 
 void copyFromJString(JNIEnv * pEnv, jstring src, char ** dst) {
     const char * pStr;
@@ -125,6 +123,4 @@
     return tls;
 }
 
-#ifdef __cplusplus
 }
-#endif