generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move some COMP functions to be inside the #ifndef OPENSSL_NO_COMP

Browse Source 
wrapping preprocessor directive.  This also removes a duplicate
declaration.
This commit is contained in:
Richard Levitte
2004-05-20 23:47:57 +00:00
parent 46ceb15c39
commit 6713a4835f
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ssl/ssl.h
View File

@@ -1200,11 +1200,6 @@ int SSL_CIPHER_get_bits(SSL_CIPHER *c,int *alg_bits);
char * SSL_CIPHER_get_version(SSL_CIPHER *c); char * SSL_CIPHER_get_version(SSL_CIPHER *c);
const char * SSL_CIPHER_get_name(SSL_CIPHER *c); const char * SSL_CIPHER_get_name(SSL_CIPHER *c);
const COMP_METHOD *SSL_get_current_compression(SSL *s);
const COMP_METHOD *SSL_get_current_expansion(SSL *s);
const char *SSL_COMP_get_name(const COMP_METHOD *comp);
STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void);
int SSL_get_fd(SSL *s); int SSL_get_fd(SSL *s);
int SSL_get_rfd(SSL *s); int SSL_get_rfd(SSL *s);
int SSL_get_wfd(SSL *s); int SSL_get_wfd(SSL *s);
@@ -1492,11 +1487,17 @@ void SSL_set_tmp_ecdh_callback(SSL *ssl,
#endif #endif
#ifndef OPENSSL_NO_COMP #ifndef OPENSSL_NO_COMP
const COMP_METHOD *SSL_get_current_compression(SSL *s);
const COMP_METHOD *SSL_get_current_expansion(SSL *s);
const char *SSL_COMP_get_name(const COMP_METHOD *comp);
STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void); STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void);
int SSL_COMP_add_compression_method(int id,COMP_METHOD *cm); int SSL_COMP_add_compression_method(int id,COMP_METHOD *cm);
#else #else
const void *SSL_get_current_compression(SSL *s);
const void *SSL_get_current_expansion(SSL *s);
const char *SSL_COMP_get_name(const void *comp);
void *SSL_COMP_get_compression_methods(void); void *SSL_COMP_get_compression_methods(void);
int SSL_COMP_add_compression_method(int id,char *cm); int SSL_COMP_add_compression_method(int id,void *cm);
#endif #endif
/* BEGIN ERROR CODES */ /* BEGIN ERROR CODES */