diff options
| author | djm <> | 2009-04-06 06:33:20 +0000 |
|---|---|---|
| committer | djm <> | 2009-04-06 06:33:20 +0000 |
| commit | ee26f086217016f09154412b171ad62a33a346f6 (patch) | |
| tree | 647f179fa8dcccf50c436cc0165a1d67476a936e /src/lib/libcrypto/symhacks.h | |
| parent | f929570d17be2469dc7104fcdf26fdaddf3dbb65 (diff) | |
| download | openbsd-ee26f086217016f09154412b171ad62a33a346f6.tar.gz openbsd-ee26f086217016f09154412b171ad62a33a346f6.tar.bz2 openbsd-ee26f086217016f09154412b171ad62a33a346f6.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/symhacks.h')
| -rw-r--r-- | src/lib/libcrypto/symhacks.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/libcrypto/symhacks.h b/src/lib/libcrypto/symhacks.h index 6cfb5fe479..8728e6124d 100644 --- a/src/lib/libcrypto/symhacks.h +++ b/src/lib/libcrypto/symhacks.h | |||
| @@ -62,6 +62,10 @@ | |||
| 62 | VAX. */ | 62 | VAX. */ |
| 63 | #ifdef OPENSSL_SYS_VMS | 63 | #ifdef OPENSSL_SYS_VMS |
| 64 | 64 | ||
| 65 | /* Hack a long name in crypto/cryptlib.c */ | ||
| 66 | #undef int_CRYPTO_set_do_dynlock_callback | ||
| 67 | #define int_CRYPTO_set_do_dynlock_callback int_CRYPTO_set_do_dynlock_cb | ||
| 68 | |||
| 65 | /* Hack a long name in crypto/ex_data.c */ | 69 | /* Hack a long name in crypto/ex_data.c */ |
| 66 | #undef CRYPTO_get_ex_data_implementation | 70 | #undef CRYPTO_get_ex_data_implementation |
| 67 | #define CRYPTO_get_ex_data_implementation CRYPTO_get_ex_data_impl | 71 | #define CRYPTO_get_ex_data_implementation CRYPTO_get_ex_data_impl |