8289275: Remove incorrect __declspec(dllimport) attributes from point…

…ers in jdk.crypto.cryptoki Reviewed-by: valeriep
openjdk · Jul 21, 2022 · 0dda3c1 · 0dda3c1
1 parent 620c8a0
commit 0dda3c1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/j2secmod_md.h b/src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/j2secmod_md.h
@@ -31,8 +31,8 @@
 //      const char *certPrefix, const char *keyPrefix,
 //      const char *secmodName, PRUint32 flags);
 
-typedef int __declspec(dllimport) (*FPTR_VersionCheck)(const char *importedVersion);
-typedef int __declspec(dllimport) (*FPTR_Initialize)(const char *configdir,
+typedef int (*FPTR_VersionCheck)(const char *importedVersion);
+typedef int (*FPTR_Initialize)(const char *configdir,
         const char *certPrefix, const char *keyPrefix,
         const char *secmodName, unsigned int flags);
 
@@ -42,6 +42,6 @@ typedef int __declspec(dllimport) (*FPTR_Initialize)(const char *configdir,
 //char **SECMOD_GetModuleSpecList(SECMODModule *module);
 //extern SECMODModuleList *SECMOD_GetDBModuleList(void);
 
-typedef void __declspec(dllimport) *(*FPTR_LoadModule)(char *moduleSpec, void *parent, int recurse);
-typedef char __declspec(dllimport) **(*FPTR_GetModuleSpecList)(void *module);
-typedef void __declspec(dllimport) *(*FPTR_GetDBModuleList)(void);
+typedef void *(*FPTR_LoadModule)(char *moduleSpec, void *parent, int recurse);
+typedef char **(*FPTR_GetModuleSpecList)(void *module);
+typedef void *(*FPTR_GetDBModuleList)(void);
diff --git a/src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/p11_md.h b/src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/p11_md.h
@@ -69,7 +69,7 @@
 #define CK_PTR *
 #define CK_DEFINE_FUNCTION(returnType, name) returnType __declspec(dllexport) name
 #define CK_DECLARE_FUNCTION(returnType, name) returnType __declspec(dllimport) name
-#define CK_DECLARE_FUNCTION_POINTER(returnType, name) returnType __declspec(dllimport) (* name)
+#define CK_DECLARE_FUNCTION_POINTER(returnType, name) returnType (* name)
 #define CK_CALLBACK_FUNCTION(returnType, name) returnType (* name)
 #ifndef NULL_PTR
 #define NULL_PTR 0