Rename lib/openpgp/openpgp.h to openpgp_int.h.

Fixes name-space collision that confuses GTK-DOC with includes/gnutls/openpgp.h.

diff --git a/lib/auth_cert.h b/lib/auth_cert.h
index 8e03af61a12ab80c32510529bedc043ebf4ce57e..27f67c985c48b236e8b232ff92fd94832b930a1a 100644 (file)
--- a/lib/auth_cert.h
+++ b/lib/auth_cert.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2003, 2004, 2005, 2007 Free Software Foundation
+ * Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -28,7 +28,7 @@
 # include "gnutls_auth.h"
 # include "auth_dh_common.h"
 # include "x509/x509.h"
-# include "openpgp/openpgp.h"
+# include "openpgp/openpgp_int.h"
 
 /* This structure may be complex, but it's the only way to
  * support a server that has multiple certificates

diff --git a/lib/openpgp/Makefile.am b/lib/openpgp/Makefile.am
index 93c479ee9fa68aa709e1b6937c7a47ada306ef3a..cf63e31a67783b7e90190af23d1e343f466e9a3c 100644 (file)
--- a/lib/openpgp/Makefile.am
+++ b/lib/openpgp/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation
 #
 # Author: Nikos Mavrogiannopoulos
 #
@@ -35,7 +35,7 @@ noinst_LTLIBRARIES = libgnutls_openpgp.la
 
 COBJECTS = pgp.c pgpverify.c extras.c compat.c privkey.c output.c
 
-libgnutls_openpgp_la_SOURCES = $(COBJECTS) openpgp.h gnutls_openpgp.h
+libgnutls_openpgp_la_SOURCES = $(COBJECTS) openpgp_int.h gnutls_openpgp.h
 
 EXTRA_DIST = pgp-api.texi
 

diff --git a/lib/openpgp/compat.c b/lib/openpgp/compat.c
index 7bcf38f147ac398394cc1227588ea1ec6db6a9e2..14649304e5d711649cc1304b312445a9988159a9 100644 (file)
--- a/lib/openpgp/compat.c
+++ b/lib/openpgp/compat.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2002, 2003, 2004, 2005, 2008 Free Software Foundation
  *
  * Author: Timo Schulz, Nikos Mavrogiannopoulos
  *
@@ -25,7 +25,7 @@
 #include <gnutls_int.h>
 #include <gnutls_errors.h>
 #include <gnutls_openpgp.h>
-#include <openpgp.h>
+#include <openpgp_int.h>
 
 /*-
  * gnutls_openpgp_verify_key - Verify all signatures on the key

diff --git a/lib/openpgp/extras.c b/lib/openpgp/extras.c
index 0faa58156bb8e9d4dd3926e99bc37170a9d3636f..d91454db09cc8ea0c7317630db15822d1099a318 100644 (file)
--- a/lib/openpgp/extras.c
+++ b/lib/openpgp/extras.c
@@ -26,7 +26,7 @@
 #include <gnutls_datum.h>
 #include <gnutls_global.h>
 #include <gnutls_errors.h>
-#include <openpgp.h>
+#include <openpgp_int.h>
 #include <gnutls_openpgp.h>
 #include <gnutls_num.h>
 

diff --git a/lib/openpgp/openpgp.h b/lib/openpgp/openpgp_int.h
similarity index 100%
rename from lib/openpgp/openpgp.h
rename to lib/openpgp/openpgp_int.h

diff --git a/lib/openpgp/pgp.c b/lib/openpgp/pgp.c
index 7b07e319b33d35f7b11ee6be2b378e72a1e20716..74513345c4cbd5681cd688ec571c2576762fcdac 100644 (file)
--- a/lib/openpgp/pgp.c
+++ b/lib/openpgp/pgp.c
@@ -26,7 +26,7 @@
 #include <gnutls_datum.h>
 #include <gnutls_global.h>
 #include <gnutls_errors.h>
-#include <openpgp.h>
+#include <openpgp_int.h>
 #include <x509/rfc2818.h>
 #include <gnutls_num.h>
 

diff --git a/lib/openpgp/pgpverify.c b/lib/openpgp/pgpverify.c
index 2df407feeb8003c0337f89d46794224bc3c7c02d..d6c117924165a83b299f347b1408aff297e6557c 100644 (file)
--- a/lib/openpgp/pgpverify.c
+++ b/lib/openpgp/pgpverify.c
@@ -23,7 +23,7 @@
  */
 
 #include <gnutls_int.h>
-#include <openpgp.h>
+#include <openpgp_int.h>
 #include <gnutls_errors.h>
 #include <gnutls_openpgp.h>
 #include <gnutls_num.h>

diff --git a/lib/openpgp/privkey.c b/lib/openpgp/privkey.c
index acbafaa6fe3d4e845ccc856a88ec1afc4aa508fc..4305fbc31ffad32cbf1c16c66fc4d4a8eb0406e3 100644 (file)
--- a/lib/openpgp/privkey.c
+++ b/lib/openpgp/privkey.c
@@ -27,7 +27,7 @@
 #include <gnutls_global.h>
 #include <gnutls_errors.h>
 #include <gnutls_num.h>
-#include <openpgp.h>
+#include <openpgp_int.h>
 #include <gnutls_openpgp.h>
 #include <x509/rfc2818.h>
 #include <gnutls_cert.h>