From: DRC <dcommander@users.sourceforge.net>
Date: Wed, 9 Feb 2011 03:27:26 +0000 (+0000)
Subject: Oops.  Need to wait until after gnutls.h is included before checking the value of... 
X-Git-Tag: v1.0.90~53
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b7ab54f0df9af7f453fedf5143ac18055e4bd52e;p=tigervnc.git

Oops.  Need to wait until after gnutls.h is included before checking the value of GNUTLS_VERSION_NUMBER


git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4266 3789f03b-4d11-0410-bbf8-ca57d06f2519
---

diff --git a/common/rfb/CSecurityTLS.cxx b/common/rfb/CSecurityTLS.cxx
index 8f4910d2..8f3e8904 100644
--- a/common/rfb/CSecurityTLS.cxx
+++ b/common/rfb/CSecurityTLS.cxx
@@ -28,17 +28,6 @@
 #error "This header should not be compiled without HAVE_GNUTLS defined"
 #endif
 
-#if !defined(GNUTLS_VERSION_NUMBER) || (GNUTLS_VERSION_NUMBER < 0x020708)
-#define GNUTLS_CERT_NOT_ACTIVATED 512
-#define GNUTLS_CERT_EXPIRED 1024
-#endif
-
-#if !defined(GNUTLS_VERSION_NUMBER) || (GNUTLS_VERSION_NUMBER < 0x020301)
-#define GNUTLS_CRT_PRINT_ONELINE 1
-#endif
-
-
-
 #include <stdlib.h>
 #ifndef WIN32
 #include <unistd.h>
@@ -57,6 +46,16 @@
 
 #include <gnutls/x509.h>
 
+#if !defined(GNUTLS_VERSION_NUMBER) || (GNUTLS_VERSION_NUMBER < 0x020708)
+#error here
+#define GNUTLS_CERT_NOT_ACTIVATED 512
+#define GNUTLS_CERT_EXPIRED 1024
+#endif
+
+#if !defined(GNUTLS_VERSION_NUMBER) || (GNUTLS_VERSION_NUMBER < 0x020301)
+#define GNUTLS_CRT_PRINT_ONELINE 1
+#endif
+
 #define TLS_DEBUG
 
 using namespace rfb;