diff -r 720fd6544b03 -r 79dc492c00ab test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/Injector.h
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/Injector.h	Mon Sep 17 15:25:42 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/Injector.h	Mon Sep 17 19:36:09 2018 -0700
@@ -279,9 +279,7 @@
     BCI_MODE_ALLOC  = 2
 };
 
-#ifdef __cplusplus
 extern "C" {
-#endif
 
 /**
  * Class file transformer. Transforms a classfile image from old_bytes
@@ -305,8 +303,6 @@
 int Inject(const u1* old_bytes, const jint old_length,
     u1** new_bytes, jint* new_length, int bci_mode);
 
-#ifdef __cplusplus
 }
-#endif
 
 #endif /* _NSK_SHARE_JVMTI_INJECTOR_H_ */