diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2015-09-30 20:32:46 -0400 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2015-10-02 16:51:56 -0400 |
| commit | 979a74f6ce2e61fb607414d9ce5f39226630bab2 (patch) | |
| tree | c5801695e918d87af2e0d02ded72ec08b09f4e14 /test_cipher.c | |
| parent | d42edc43ef8bd40897f5dc599eb4c02b7e69e4b2 (diff) | |
| download | mod_nss-979a74f6ce2e61fb607414d9ce5f39226630bab2.tar.gz mod_nss-979a74f6ce2e61fb607414d9ce5f39226630bab2.tar.xz mod_nss-979a74f6ce2e61fb607414d9ce5f39226630bab2.zip | |
Fix compatibility with RHEL 6.x (Apache 2.2.x and NSS 3.15.1)
Diffstat (limited to 'test_cipher.c')
| -rw-r--r-- | test_cipher.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/test_cipher.c b/test_cipher.c index 97c8848..05b0a34 100644 --- a/test_cipher.c +++ b/test_cipher.c @@ -17,6 +17,7 @@ #include <stdlib.h> #include <stdarg.h> #include <sslproto.h> +#include "ap_release.h" /* Fake a few Apache and NSPR data types and definitions */ typedef char server_rec; @@ -29,9 +30,14 @@ typedef int PRInt32; #include <nss_engine_cipher.h> extern cipher_properties ciphers_def[]; +extern ciphernum; /* An Apache-like error logger */ +#if AP_SERVER_MINORVERSION_NUMBER <= 2 +int ap_log_error(const char *fn, int line, +#else int ap_log_error_(const char *fn, int line, int module_index, +#endif int level, int status, const server_rec *s, char *fmt, ...) { @@ -46,7 +52,9 @@ int ap_log_error_(const char *fn, int line, int module_index, return 0; } +#if AP_SERVER_MINORVERSION_NUMBER > 2 #define ap_log_error_ ap_log_error +#endif int main(int argc, char ** argv) { |