Skip to content

Commit

Permalink
8289275: Remove incorrect __declspec(dllimport) attributes from point…
Browse files Browse the repository at this point in the history
…ers in jdk.crypto.cryptoki

Reviewed-by: valeriep
  • Loading branch information
TheShermanTanker authored and Valerie Peng committed Jul 21, 2022
1 parent 620c8a0 commit 0dda3c1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/j2secmod_md.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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);
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

1 comment on commit 0dda3c1

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.