diff options
author | QAston <none@none> | 2009-05-15 18:00:50 +0200 |
---|---|---|
committer | QAston <none@none> | 2009-05-15 18:00:50 +0200 |
commit | a796012723dd2410a150264a4f32f00bc570ef76 (patch) | |
tree | d55cada7db3c9c752815c79d9d164069acd99edc /dep/include/openssl/pem.h | |
parent | ae461a4158d6376e28e7bc53d3f7ad5690a5064e (diff) | |
parent | ad92f5e210b7a2c0584cdabd30560fe723d160be (diff) |
*Merge some fixes from tc1
--HG--
branch : trunk
Diffstat (limited to 'dep/include/openssl/pem.h')
-rw-r--r-- | dep/include/openssl/pem.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/dep/include/openssl/pem.h b/dep/include/openssl/pem.h index 6f8e01544bb..6c193f1cbfa 100644 --- a/dep/include/openssl/pem.h +++ b/dep/include/openssl/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 |