From: Nikos <nmav@crystal.(none)>
Date: Mon, 14 Jan 2008 19:08:18 +0000 (+0200)
Subject: moved common stuff to gnutls.h
X-Git-Tag: gnutls_2_3_1~61
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c6093b9df165dfbfbce8922e2192eedba5303f08;p=thirdparty%2Fgnutls.git

moved common stuff to gnutls.h
---

diff --git a/includes/gnutls/gnutls.h.in b/includes/gnutls/gnutls.h.in
index 11d1526ea2..3595ef29a2 100644
--- a/includes/gnutls/gnutls.h.in
+++ b/includes/gnutls/gnutls.h.in
@@ -280,6 +280,13 @@ extern "C"
     GNUTLS_X509_FMT_PEM
   } gnutls_x509_crt_fmt_t;
 
+  typedef enum gnutls_certificate_print_formats
+    {
+      GNUTLS_X509_CRT_FULL,
+      GNUTLS_X509_CRT_ONELINE,
+      GNUTLS_X509_CRT_UNSIGNED_FULL
+    } gnutls_certificate_print_formats_t;
+
   typedef enum
   {
     GNUTLS_PK_UNKNOWN = 0,
diff --git a/includes/gnutls/x509.h b/includes/gnutls/x509.h
index bdfbadac4c..ad184b8074 100644
--- a/includes/gnutls/x509.h
+++ b/includes/gnutls/x509.h
@@ -287,13 +287,6 @@ extern "C"
 				 const char *policy,
 				 size_t sizeof_policy);
 
-  typedef enum gnutls_certificate_print_formats
-    {
-      GNUTLS_X509_CRT_FULL,
-      GNUTLS_X509_CRT_ONELINE,
-      GNUTLS_X509_CRT_UNSIGNED_FULL
-    } gnutls_certificate_print_formats_t;
-
   int gnutls_x509_crt_print (gnutls_x509_crt_t cert,
 			     gnutls_certificate_print_formats_t format,
 			     gnutls_datum_t *out);