diff options
| author | Adam Tkac <atkac@redhat.com> | 2011-02-09 16:06:16 +0000 |
|---|---|---|
| committer | Adam Tkac <atkac@redhat.com> | 2011-02-09 16:06:16 +0000 |
| commit | d007ececa0d360bf8107db21d86db6930f03e766 (patch) | |
| tree | ff4cc5a574e16e8bc04d0841ffe8b857c430ebb9 /common/os | |
| parent | b48642369217f870e8571b27196d165aca61d75a (diff) | |
| download | tigervnc-d007ececa0d360bf8107db21d86db6930f03e766.tar.gz tigervnc-d007ececa0d360bf8107db21d86db6930f03e766.zip | |
[Bugfix] Fix Windows build, recently added GNUTLS compat code broke it.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4279 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'common/os')
| -rw-r--r-- | common/os/tls.cxx | 2 | ||||
| -rw-r--r-- | common/os/tls.h | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/common/os/tls.cxx b/common/os/tls.cxx index cd67ce78..c0929968 100644 --- a/common/os/tls.cxx +++ b/common/os/tls.cxx @@ -32,7 +32,7 @@ using namespace std; -#ifdef HAVE_GNUTLS +#if defined(HAVE_GNUTLS) && !defined(WIN32) #include <gnutls/gnutls.h> #include <gnutls/x509.h> diff --git a/common/os/tls.h b/common/os/tls.h index 6dd0f324..8980197c 100644 --- a/common/os/tls.h +++ b/common/os/tls.h @@ -23,7 +23,11 @@ #include <config.h> #endif -#ifdef HAVE_GNUTLS +/* + * Windows builds are build against fairly new GNUTLS, ignore compatibility + * code. + */ +#if defined(HAVE_GNUTLS) && !defined(WIN32) #include <gnutls/gnutls.h> #ifndef HAVE_GNUTLS_DATUM_T @@ -40,9 +44,6 @@ typedef gnutls_sign_algorithm gnutls_sign_algorithm_t; #endif #ifndef HAVE_GNUTLS_X509_CRT_PRINT -#ifdef WIN32 -#error "Please install more recent GNUTLS with gnutls_x509_crt_print() function" -#endif typedef enum { GNUTLS_CRT_PRINT_ONELINE = 1 |