Use OPENSSL_GLOBAL, OPENSSL_EXTERN instead of GLOBAL and EXTERN.

This commit is contained in:
Bodo Möller 1999-05-15 14:38:10 +00:00
parent 3398f6cc21
commit e1999b1dab
9 changed files with 10 additions and 22 deletions

View File

@ -69,7 +69,7 @@ extern "C" {
#include <stdio.h> #include <stdio.h>
#include <openssl/opensslconf.h> /* DES_LONG */ #include <openssl/opensslconf.h> /* DES_LONG */
#include <openssl/e_os2.h> /* EXTERN */ #include <openssl/e_os2.h> /* OPENSSL_EXTERN */
#ifdef VMS #ifdef VMS
#undef des_init_random_number_generator #undef des_init_random_number_generator

View File

@ -431,7 +431,7 @@
PERM_OP(l,r,tt, 4,0x0f0f0f0fL); \ PERM_OP(l,r,tt, 4,0x0f0f0f0fL); \
} }
EXTERN const DES_LONG des_SPtrans[8][64]; OPENSSL_EXTERN const DES_LONG des_SPtrans[8][64];
void fcrypt_body(DES_LONG *out,des_key_schedule ks, void fcrypt_body(DES_LONG *out,des_key_schedule ks,
DES_LONG Eswap0, DES_LONG Eswap1); DES_LONG Eswap0, DES_LONG Eswap1);

View File

@ -56,5 +56,5 @@
* [including the GNU Public Licence.] * [including the GNU Public Licence.]
*/ */
EXTERN char *DES_version; /* SSLeay version string */ OPENSSL_EXTERN char *DES_version; /* SSLeay version string */
EXTERN char *libdes_version; /* old libdes version string */ OPENSSL_EXTERN char *libdes_version; /* old libdes version string */

View File

@ -60,8 +60,8 @@
#include "spr.h" #include "spr.h"
#include <openssl/opensslv.h> #include <openssl/opensslv.h>
GLOBAL const char *libdes_version="libdes v 3.24 - 20-Apr-1996 - eay"; OPENSSL_GLOBAL const char *libdes_version="libdes v 3.24 - 20-Apr-1996 - eay";
GLOBAL const char *DES_version="DES" OPENSSL_VERSION_PTEXT; OPENSSL_GLOBAL const char *DES_version="DES" OPENSSL_VERSION_PTEXT;
const char *des_options(void) const char *des_options(void)
{ {

View File

@ -63,7 +63,7 @@
/* This has some uglies in it but it works - even over sockets. */ /* This has some uglies in it but it works - even over sockets. */
/*extern int errno;*/ /*extern int errno;*/
GLOBAL int des_rw_mode=DES_PCBC_MODE; OPENSSL_GLOBAL int des_rw_mode=DES_PCBC_MODE;
/* /*

View File

@ -68,7 +68,7 @@
#include "sk.h" #include "sk.h"
static int check_parity(const des_cblock key); static int check_parity(const des_cblock key);
GLOBAL int des_check_key=0; OPENSSL_GLOBAL int des_check_key=0;
void des_set_odd_parity(des_cblock key) void des_set_odd_parity(des_cblock key)
{ {

View File

@ -56,7 +56,7 @@
* [including the GNU Public Licence.] * [including the GNU Public Licence.]
*/ */
GLOBAL const DES_LONG des_SPtrans[8][64]={ OPENSSL_GLOBAL const DES_LONG des_SPtrans[8][64]={
{ {
/* nibble 0 */ /* nibble 0 */
0x02080800L, 0x00080000L, 0x02000002L, 0x02080802L, 0x02080800L, 0x00080000L, 0x02000002L, 0x02080802L,

View File

@ -58,7 +58,7 @@
#include "des_locl.h" #include "des_locl.h"
EXTERN int des_check_key; OPENSSL_EXTERN int des_check_key;
void des_string_to_key(const char *str, des_cblock key) void des_string_to_key(const char *str, des_cblock key)
{ {

12
e_os2.h
View File

@ -21,18 +21,6 @@ extern "C" {
# define OPENSSL_GLOBAL # define OPENSSL_GLOBAL
#endif #endif
/* The above definitions should be used throughout the library,
* but as long as EXTERN and GLOBAL occur there, we keep the following
* definitions, too: */
#if defined(VMS) && !defined(__DECC)
# define EXTERN globalref
# define GLOBAL globaldef
#else
# define EXTERN extern
# define GLOBAL
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif