diff options
| author |   jsing <jsing@openbsd.org> | 2014-05-22 17:53:00 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2014-05-22 17:53:00 +0000 |
| commit | 1d21c530edfb4524553d1ac24403f503f1d6b314 (patch) | |
| tree | 2d93f8a252644cf220d3064c4e7ab90744f31525 /lib/libcrypto/engine/engine.h | |
| parent | There are two actual uses of e_os2.h in libssl - an OPENSSL_GLOBAL (an (diff) | |
| download | wireguard-openbsd-1d21c530edfb4524553d1ac24403f503f1d6b314.tar.xz wireguard-openbsd-1d21c530edfb4524553d1ac24403f503f1d6b314.zip | |
Expand the OPENSSL_{GLOBAL,EXPORT,IMPORT,EXTERN} macros - this rids the
libssl tree from all uses of these defines.
ok miod@
Diffstat (limited to 'lib/libcrypto/engine/engine.h')
| -rw-r--r-- | lib/libcrypto/engine/engine.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/libcrypto/engine/engine.h b/lib/libcrypto/engine/engine.h index 096c271b614..5c2f7b05276 100644 --- a/lib/libcrypto/engine/engine.h +++ b/lib/libcrypto/engine/engine.h @@ -654,8 +654,8 @@ typedef struct st_dynamic_fns { * can be fully instantiated with IMPLEMENT_DYNAMIC_CHECK_FN(). */ typedef unsigned long (*dynamic_v_check_fn)(unsigned long ossl_version); #define IMPLEMENT_DYNAMIC_CHECK_FN() \ - OPENSSL_EXPORT unsigned long v_check(unsigned long v); \ - OPENSSL_EXPORT unsigned long v_check(unsigned long v) { \ + extern unsigned long v_check(unsigned long v); \ + extern unsigned long v_check(unsigned long v) { \ if(v >= OSSL_DYNAMIC_OLDEST) return OSSL_DYNAMIC_VERSION; \ return 0; } @@ -677,9 +677,9 @@ typedef unsigned long (*dynamic_v_check_fn)(unsigned long ossl_version); typedef int (*dynamic_bind_engine)(ENGINE *e, const char *id, const dynamic_fns *fns); #define IMPLEMENT_DYNAMIC_BIND_FN(fn) \ - OPENSSL_EXPORT \ + extern \ int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns); \ - OPENSSL_EXPORT \ + extern \ int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns) { \ if(ENGINE_get_static_state() == fns->static_state) goto skip_cbs; \ if(!CRYPTO_set_mem_functions(fns->mem_fns.malloc_cb, \ |