diff options
author | Simon Josefsson <simon@josefsson.org> | 2008-02-25 16:26:44 +0100 |
---|---|---|
committer | Simon Josefsson <simon@josefsson.org> | 2008-02-25 16:26:44 +0100 |
commit | ba2c436fce2b7a50448d0dcc95a69d2a03d8901a (patch) | |
tree | a83113f5f76c9b7a46287291dc24bcf88833ed3b | |
parent | 7e8c20003f83d04a82abbfe3fd267e04ddf0b17e (diff) | |
download | gnutls-ba2c436fce2b7a50448d0dcc95a69d2a03d8901a.tar.gz |
Rename lib/openpgp/openpgp.h to openpgp_int.h.
Fixes name-space collision that confuses GTK-DOC with includes/gnutls/openpgp.h.
-rw-r--r-- | lib/auth_cert.h | 4 | ||||
-rw-r--r-- | lib/openpgp/Makefile.am | 4 | ||||
-rw-r--r-- | lib/openpgp/compat.c | 4 | ||||
-rw-r--r-- | lib/openpgp/extras.c | 2 | ||||
-rw-r--r-- | lib/openpgp/openpgp_int.h (renamed from lib/openpgp/openpgp.h) | 0 | ||||
-rw-r--r-- | lib/openpgp/pgp.c | 2 | ||||
-rw-r--r-- | lib/openpgp/pgpverify.c | 2 | ||||
-rw-r--r-- | lib/openpgp/privkey.c | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/lib/auth_cert.h b/lib/auth_cert.h index 8e03af61a1..27f67c985c 100644 --- 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 93c479ee9f..cf63e31a67 100644 --- 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 7bcf38f147..14649304e5 100644 --- 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 0faa58156b..d91454db09 100644 --- 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 index 2030d38371..2030d38371 100644 --- a/lib/openpgp/openpgp.h +++ b/lib/openpgp/openpgp_int.h diff --git a/lib/openpgp/pgp.c b/lib/openpgp/pgp.c index 7b07e319b3..74513345c4 100644 --- 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 2df407feeb..d6c1179241 100644 --- 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 acbafaa6fe..4305fbc31f 100644 --- 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> |