diff options
| author | jimw@mysql.com <> | 2006-05-19 16:17:24 -0700 |
|---|---|---|
| committer | jimw@mysql.com <> | 2006-05-19 16:17:24 -0700 |
| commit | 2b13192c2e3cb73c962e9e03264b38fb629ec6e7 (patch) | |
| tree | 7c33cbe46adf4c8f526f3f2de68fb9c3701071d3 /include/sslopt-vars.h | |
| parent | 49eeb1bb5727ea66fa3b805b77f8283494c326c9 (diff) | |
| parent | ebe38efaa6feaff5dd7f1e5dfb8dbd6cbf253c29 (diff) | |
| download | mariadb-git-2b13192c2e3cb73c962e9e03264b38fb629ec6e7.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.0-1039
into mysql.com:/home/jimw/my/mysql-5.0-clean
Diffstat (limited to 'include/sslopt-vars.h')
| -rw-r--r-- | include/sslopt-vars.h | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/include/sslopt-vars.h b/include/sslopt-vars.h index 8e5f3434396..7204145fc28 100644 --- a/include/sslopt-vars.h +++ b/include/sslopt-vars.h @@ -15,13 +15,18 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_OPENSSL -static my_bool opt_use_ssl = 0; -static char *opt_ssl_key = 0; -static char *opt_ssl_cert = 0; -static char *opt_ssl_ca = 0; -static char *opt_ssl_capath = 0; -static char *opt_ssl_cipher = 0; +#ifdef SSL_VARS_NOT_STATIC +#define SSL_STATIC +#else +#define SSL_STATIC static +#endif +SSL_STATIC my_bool opt_use_ssl = 0; +SSL_STATIC char *opt_ssl_ca = 0; +SSL_STATIC char *opt_ssl_capath = 0; +SSL_STATIC char *opt_ssl_cert = 0; +SSL_STATIC char *opt_ssl_cipher = 0; +SSL_STATIC char *opt_ssl_key = 0; #ifdef MYSQL_CLIENT -static my_bool opt_ssl_verify_server_cert= 0; +SSL_STATIC my_bool opt_ssl_verify_server_cert= 0; #endif #endif |