--- a/src/jdk.hotspot.agent/linux/native/libsaproc/proc_service.h	Tue Feb 13 15:28:07 2018 +0100
+++ b/src/jdk.hotspot.agent/linux/native/libsaproc/proc_service.h	Mon Jun 11 11:23:20 2018 +0200
@@ -45,7 +45,7 @@
 } ps_err_e;
 
 // ps_getpid() is only defined on Linux to return a thread's process ID
-JNIEXPORT pid_t
+JNIEXPORT pid_t JNICALL
 ps_getpid(struct ps_prochandle *ph);
 
 // ps_pglobal_lookup() looks up the symbol sym_name in the symbol table
@@ -53,34 +53,34 @@
 // It returns the symbol's value as an address in the target process in
 // *sym_addr.
 
-JNIEXPORT ps_err_e
+JNIEXPORT ps_err_e JNICALL
 ps_pglobal_lookup(struct ps_prochandle *ph, const char *object_name,
                     const char *sym_name, psaddr_t *sym_addr);
 
 // read "size" bytes of data from debuggee at address "addr"
-JNIEXPORT ps_err_e
+JNIEXPORT ps_err_e JNICALL
 ps_pdread(struct ps_prochandle *ph, psaddr_t  addr,
                    void *buf, size_t size);
 
 // write "size" bytes of data to debuggee at address "addr"
-JNIEXPORT ps_err_e
+JNIEXPORT ps_err_e JNICALL
 ps_pdwrite(struct ps_prochandle *ph, psaddr_t addr,
                     const void *buf, size_t size);
 
-JNIEXPORT ps_err_e
+JNIEXPORT ps_err_e JNICALL
 ps_lsetfpregs(struct ps_prochandle *ph, lwpid_t lid, const prfpregset_t *fpregs);
 
-JNIEXPORT ps_err_e
+JNIEXPORT ps_err_e JNICALL
 ps_lsetregs(struct ps_prochandle *ph, lwpid_t lid, const prgregset_t gregset);
 
-JNIEXPORT ps_err_e
-ps_lgetfpregs(struct  ps_prochandle  *ph,  lwpid_t lid, prfpregset_t *fpregs);
+JNIEXPORT ps_err_e JNICALL
+ps_lgetfpregs(struct ps_prochandle *ph, lwpid_t lid, prfpregset_t *fpregs);
 
-JNIEXPORT ps_err_e
+JNIEXPORT ps_err_e JNICALL
 ps_lgetregs(struct ps_prochandle *ph, lwpid_t lid, prgregset_t gregset);
 
 // new libthread_db of NPTL seem to require this symbol
-JNIEXPORT ps_err_e
+JNIEXPORT ps_err_e JNICALL
 ps_get_thread_area();
 
 #endif /* _PROC_SERVICE_H_ */