Revision: 4279
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4279&view=rev
Author: atkac
Date: 2011-02-09 16:06:16 +0000 (Wed, 09 Feb 2011)
Log Message:
-----------
[Bugfix] Fix Windows build, recently added GNUTLS compat code broke it.
Modified Paths:
--------------
trunk/common/os/tls.cxx
trunk/common/os/tls.h
Modified: trunk/common/os/tls.cxx
===================================================================
--- trunk/common/os/tls.cxx 2011-02-09 15:38:37 UTC (rev 4278)
+++ trunk/common/os/tls.cxx 2011-02-09 16:06:16 UTC (rev 4279)
@@ -32,7 +32,7 @@
using namespace std;
-#ifdef HAVE_GNUTLS
+#if defined(HAVE_GNUTLS) && !defined(WIN32)
#include <gnutls/gnutls.h>
#include <gnutls/x509.h>
Modified: trunk/common/os/tls.h
===================================================================
--- trunk/common/os/tls.h 2011-02-09 15:38:37 UTC (rev 4278)
+++ trunk/common/os/tls.h 2011-02-09 16:06:16 UTC (rev 4279)
@@ -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 @@
#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
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Tigervnc-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
