aboutsummaryrefslogtreecommitdiff
path: root/src/testcurl/curl_version_check.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/testcurl/curl_version_check.c')
-rw-r--r--src/testcurl/curl_version_check.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/testcurl/curl_version_check.c b/src/testcurl/curl_version_check.c
index 37bb536c..dff143f8 100644
--- a/src/testcurl/curl_version_check.c
+++ b/src/testcurl/curl_version_check.c
@@ -67,13 +67,13 @@ parse_version_string (const char *s, int *major, int *minor, int *micro)
67 return s; 67 return s;
68} 68}
69 69
70#if HTTPS_SUPPORT 70#ifdef HTTPS_SUPPORT
71int 71int
72curl_uses_nss_ssl() 72curl_uses_nss_ssl()
73{ 73{
74 return (strstr(curl_version(), " NSS/") != NULL) ? 0 : -1; 74 return (strstr(curl_version(), " NSS/") != NULL) ? 0 : -1;
75} 75}
76#endif 76#endif /* HTTPS_SUPPORT */
77 77
78/* 78/*
79 * check local libcurl version matches required version 79 * check local libcurl version matches required version
@@ -83,10 +83,10 @@ curl_check_version (const char *req_version)
83{ 83{
84 const char *ver; 84 const char *ver;
85 const char *curl_ver; 85 const char *curl_ver;
86#if HTTPS_SUPPORT 86#ifdef HTTPS_SUPPORT
87 const char *ssl_ver; 87 const char *ssl_ver;
88 const char *req_ssl_ver; 88 const char *req_ssl_ver;
89#endif 89#endif /* HTTPS_SUPPORT */
90 90
91 int loc_major, loc_minor, loc_micro; 91 int loc_major, loc_minor, loc_micro;
92 int rq_major, rq_minor, rq_micro; 92 int rq_major, rq_minor, rq_micro;
@@ -127,7 +127,7 @@ curl_check_version (const char *req_version)
127 * enforce required gnutls/openssl version. 127 * enforce required gnutls/openssl version.
128 * TODO use curl version string to assert use of gnutls 128 * TODO use curl version string to assert use of gnutls
129 */ 129 */
130#if HTTPS_SUPPORT 130#ifdef HTTPS_SUPPORT
131 ssl_ver = strchr (curl_ver, ' '); 131 ssl_ver = strchr (curl_ver, ' ');
132 if (ssl_ver == NULL) 132 if (ssl_ver == NULL)
133 return -1; 133 return -1;
@@ -171,6 +171,6 @@ curl_check_version (const char *req_version)
171 req_ssl_ver); 171 req_ssl_ver);
172 return -1; 172 return -1;
173 } 173 }
174#endif 174#endif /* HTTPS_SUPPORT */
175 return 0; 175 return 0;
176} 176}