diff -r 720fd6544b03 -r 79dc492c00ab test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_list.h
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_list.h	Mon Sep 17 15:25:42 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_list.h	Mon Sep 17 19:36:09 2018 -0700
@@ -24,9 +24,7 @@
 #ifndef NSK_LIST
 #define NSK_LIST
 
-#ifdef __cplusplus
 extern "C" {
-#endif
 
 /**
  * Prepares array of pointers which has fixed INITIAL_SIZE.
@@ -68,8 +66,6 @@
  */
 int nsk_list_remove(const void *plist, int i);
 
-#ifdef __cplusplus
 }
-#endif
 
 #endif