moved common stuff to gnutls.h

diff --git a/includes/gnutls/gnutls.h.in b/includes/gnutls/gnutls.h.in
index 11d1526ea2e6b3a7f12ae0949ce8850392029f5d..3595ef29a2f4de358b94ee2cc67be06832f3dae8 100644 (file)
--- 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 bdfbadac4c7d0ae462dcf65a775a5a752ba43eaa..ad184b80749713efc05d7c8bb89aaa5c5e7e1b3b 100644 (file)
--- 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);