diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2009-04-06 06:33:21 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2009-04-06 06:33:21 +0000 |
| commit | 4af955ab47cb58f0856af2543cfd369ca621acf4 (patch) | |
| tree | 2a9f13536ecfa4cb24b1f0b68532d101a9c44ef6 /lib/libcrypto/pem/pem.h | |
| parent | cea69e0d929b3248b3139c9ca312f9c85933095f (diff) | |
resolve conflicts
Diffstat (limited to 'lib/libcrypto/pem/pem.h')
| -rw-r--r-- | lib/libcrypto/pem/pem.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/libcrypto/pem/pem.h b/lib/libcrypto/pem/pem.h index 6f8e01544bb..6c193f1cbfa 100644 --- a/lib/libcrypto/pem/pem.h +++ b/lib/libcrypto/pem/pem.h @@ -215,7 +215,9 @@ typedef struct pem_ctx_st #define IMPLEMENT_PEM_read_fp(name, type, str, asn1) /**/ #define IMPLEMENT_PEM_write_fp(name, type, str, asn1) /**/ +#define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) /**/ #define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) /**/ +#define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) /**/ #else @@ -355,6 +357,7 @@ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \ #define DECLARE_PEM_read_fp(name, type) /**/ #define DECLARE_PEM_write_fp(name, type) /**/ +#define DECLARE_PEM_write_fp_const(name, type) /**/ #define DECLARE_PEM_write_cb_fp(name, type) /**/ #else @@ -392,6 +395,7 @@ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \ #define DECLARE_PEM_read_bio(name, type) /**/ #define DECLARE_PEM_write_bio(name, type) /**/ +#define DECLARE_PEM_write_bio_const(name, type) /**/ #define DECLARE_PEM_write_cb_bio(name, type) /**/ #endif |