diff -r 720fd6544b03 -r 79dc492c00ab test/hotspot/jtreg/vmTestbase/nsk/share/jni/jni_tools.h
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jni/jni_tools.h	Mon Sep 17 15:25:42 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jni/jni_tools.h	Mon Sep 17 19:36:09 2018 -0700
@@ -94,9 +94,7 @@
 
 /*************************************************************/
 
-#ifdef __cplusplus
 extern "C" {
-#endif
 
 /*************************************************************/
 
@@ -165,9 +163,7 @@
 
 /*************************************************************/
 
-#ifdef __cplusplus
 }
-#endif
 
 /*************************************************************/