diff -r 720fd6544b03 -r 79dc492c00ab test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/unit/Heap.cpp
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/unit/Heap.cpp	Mon Sep 17 15:25:42 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/unit/Heap.cpp	Mon Sep 17 19:36:09 2018 -0700
@@ -29,9 +29,7 @@
 #include "jvmti.h"
 #include "agent_common.h"
 
-#ifdef __cplusplus
 extern "C" {
-#endif
 
 static jvmtiEnv *jvmti;
 static jint dummy_user_data;
@@ -470,6 +468,4 @@
     return 0;
 }
 
-#ifdef __cplusplus
 }
-#endif