--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap004/iterheap004.cpp	Mon Sep 17 15:25:42 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap004/iterheap004.cpp	Mon Sep 17 19:36:09 2018 -0700
@@ -27,9 +27,7 @@
 #include "jni_tools.h"
 #include "jvmti_tools.h"
 
-#ifdef __cplusplus
 extern "C" {
-#endif
 
 static JNIEnv *jni = NULL;
 static jvmtiEnv *jvmti = NULL;
@@ -279,6 +277,4 @@
 
 /* ============================================================================= */
 
-#ifdef __cplusplus
 }
-#endif