diff options
| author | Rich Salz <rsalz@akamai.com> | 2016-01-30 16:43:37 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-01-30 18:11:12 -0500 |
| commit | 9716b0b9deb68ffe268235841eba80ea4e31a9d0 (patch) | |
| tree | e431e84d860d9a14d320891dda327dd2eedf19b2 /include | |
| parent | 94af0cd7f3a8130bbc23feb743b176a74eec7e10 (diff) | |
Remove extra level of indirection.
Remove OPENSSL_IMPORT as its only purpose is to define OPENSSL_EXTERN.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/e_os2.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/include/openssl/e_os2.h b/include/openssl/e_os2.h index 2cfbe7aa46..159e0b3739 100644 --- a/include/openssl/e_os2.h +++ b/include/openssl/e_os2.h @@ -207,7 +207,7 @@ extern "C" { * Definitions of OPENSSL_GLOBAL and OPENSSL_EXTERN, to define and declare * certain global symbols that, with some compilers under VMS, have to be * 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 * more complicated to use. Basically, for any library that exports some * global variables, the following code must be present in the header file @@ -218,25 +218,23 @@ extern "C" { * # define OPENSSL_EXTERN OPENSSL_EXPORT * #endif * - * The default is to have OPENSSL_EXPORT, OPENSSL_IMPORT and OPENSSL_GLOBAL - * have some generally sensible values, and for OPENSSL_EXTERN to have the - * value OPENSSL_IMPORT. + * The default is to have OPENSSL_EXPORT, OPENSSL_EXTERN and OPENSSL_GLOBAL + * have some generally sensible values. */ # if defined(OPENSSL_SYS_VMS_NODECC) # define OPENSSL_EXPORT globalref -# define OPENSSL_IMPORT globalref +# define OPENSSL_EXTERN globalref # define OPENSSL_GLOBAL globaldef # elif defined(OPENSSL_SYS_WINDOWS) && defined(OPENSSL_OPT_WINDLL) # define OPENSSL_EXPORT extern __declspec(dllexport) -# define OPENSSL_IMPORT extern __declspec(dllimport) +# define OPENSSL_EXTERN extern __declspec(dllimport) # define OPENSSL_GLOBAL # else # define OPENSSL_EXPORT extern -# define OPENSSL_IMPORT extern +# define OPENSSL_EXTERN extern # define OPENSSL_GLOBAL # endif -# define OPENSSL_EXTERN OPENSSL_IMPORT /*- * Macros to allow global variables to be reached through function calls when |