diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2006-06-27 05:07:04 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2006-06-27 05:07:04 +0000 |
| commit | 0fa0c9fb7d6f4ad7a423044f28b55eaaedc63f28 (patch) | |
| tree | 98d6947cd8474ab98b57494ebef50e97659be043 /lib/libcrypto/des | |
| parent | ecc645c71513728e7357c84aa8997b4dc2301936 (diff) | |
resolve conflicts
Diffstat (limited to 'lib/libcrypto/des')
| -rw-r--r-- | lib/libcrypto/des/des_locl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libcrypto/des/des_locl.h b/lib/libcrypto/des/des_locl.h index e44e8e98b25..8f04b18c50f 100644 --- a/lib/libcrypto/des/des_locl.h +++ b/lib/libcrypto/des/des_locl.h @@ -421,7 +421,7 @@ PERM_OP(l,r,tt, 4,0x0f0f0f0fL); \ } -OPENSSL_EXTERN const DES_LONG DES_SPtrans[8][64]; +extern const DES_LONG DES_SPtrans[8][64]; void fcrypt_body(DES_LONG *out,DES_key_schedule *ks, DES_LONG Eswap0, DES_LONG Eswap1); |