Skip to content
Snippets Groups Projects
Commit 9716b0b9 authored by Rich Salz's avatar Rich Salz Committed by Rich Salz
Browse files

Remove extra level of indirection.


Remove OPENSSL_IMPORT as its only purpose is to define OPENSSL_EXTERN.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 94af0cd7
No related branches found
No related tags found
No related merge requests found
...@@ -207,7 +207,7 @@ extern "C" { ...@@ -207,7 +207,7 @@ extern "C" {
* Definitions of OPENSSL_GLOBAL and OPENSSL_EXTERN, to define and declare * Definitions of OPENSSL_GLOBAL and OPENSSL_EXTERN, to define and declare
* certain global symbols that, with some compilers under VMS, have to be * certain global symbols that, with some compilers under VMS, have to be
* defined and declared explicitely with globaldef and globalref. * defined and declared explicitely with globaldef and globalref.
* Definitions of OPENSSL_EXPORT and OPENSSL_IMPORT, to define and declare * Definitions of OPENSSL_EXPORT and OPENSSL_EXTERN, to define and declare
* DLL exports and imports for compilers under Win32. These are a little * DLL exports and imports for compilers under Win32. These are a little
* more complicated to use. Basically, for any library that exports some * more complicated to use. Basically, for any library that exports some
* global variables, the following code must be present in the header file * global variables, the following code must be present in the header file
...@@ -218,25 +218,23 @@ extern "C" { ...@@ -218,25 +218,23 @@ extern "C" {
* # define OPENSSL_EXTERN OPENSSL_EXPORT * # define OPENSSL_EXTERN OPENSSL_EXPORT
* #endif * #endif
* *
* The default is to have OPENSSL_EXPORT, OPENSSL_IMPORT and OPENSSL_GLOBAL * The default is to have OPENSSL_EXPORT, OPENSSL_EXTERN and OPENSSL_GLOBAL
* have some generally sensible values, and for OPENSSL_EXTERN to have the * have some generally sensible values.
* value OPENSSL_IMPORT.
*/ */
# if defined(OPENSSL_SYS_VMS_NODECC) # if defined(OPENSSL_SYS_VMS_NODECC)
# define OPENSSL_EXPORT globalref # define OPENSSL_EXPORT globalref
# define OPENSSL_IMPORT globalref # define OPENSSL_EXTERN globalref
# define OPENSSL_GLOBAL globaldef # define OPENSSL_GLOBAL globaldef
# elif defined(OPENSSL_SYS_WINDOWS) && defined(OPENSSL_OPT_WINDLL) # elif defined(OPENSSL_SYS_WINDOWS) && defined(OPENSSL_OPT_WINDLL)
# define OPENSSL_EXPORT extern __declspec(dllexport) # define OPENSSL_EXPORT extern __declspec(dllexport)
# define OPENSSL_IMPORT extern __declspec(dllimport) # define OPENSSL_EXTERN extern __declspec(dllimport)
# define OPENSSL_GLOBAL # define OPENSSL_GLOBAL
# else # else
# define OPENSSL_EXPORT extern # define OPENSSL_EXPORT extern
# define OPENSSL_IMPORT extern # define OPENSSL_EXTERN extern
# define OPENSSL_GLOBAL # define OPENSSL_GLOBAL
# endif # endif
# define OPENSSL_EXTERN OPENSSL_IMPORT
/*- /*-
* Macros to allow global variables to be reached through function calls when * Macros to allow global variables to be reached through function calls when
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment