diff options
| author | Werner Koch <[email protected]> | 2015-12-21 10:37:21 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2015-12-21 10:37:21 +0000 |
| commit | 98f9e14323bf806f674b3cc259e19ef6219b4378 (patch) | |
| tree | 620a0731491d8ebbb6f3c46aa12afed8aa99658b /common/call-gpg.h | |
| parent | build: Add required macro for pkg-config (diff) | |
| download | gnupg-98f9e14323bf806f674b3cc259e19ef6219b4378.tar.gz gnupg-98f9e14323bf806f674b3cc259e19ef6219b4378.zip | |
common: New file fwddecl.h.
* common/util.h (server_control_s, ctrl_t): Move to ...
* common/fwddecl.h: New file.
* common/call-gpg.h: Replace typedef by fwddecl.h. Change include
protection macro name.
* common/Makefile.am (common_sources): Add fwddecl.h.
--
It seems some compilers do not grok a re-declaration. Thus we factor
it out into a separate file and use the include protection macro to
protect against re-declaration.
GnuPG-bug-id: 2200
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'common/call-gpg.h')
| -rw-r--r-- | common/call-gpg.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/common/call-gpg.h b/common/call-gpg.h index 74d381985..19993ef0b 100644 --- a/common/call-gpg.h +++ b/common/call-gpg.h @@ -17,15 +17,14 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef G13_CALL_GPG_H -#define G13_CALL_GPG_H +#ifndef GNUPG_COMMON_CALL_GPG_H +#define GNUPG_COMMON_CALL_GPG_H #include <gpg-error.h> +#include "fwddecl.h" #include "strlist.h" -typedef struct server_control_s *ctrl_t; - gpg_error_t gpg_encrypt_blob (ctrl_t ctrl, const char *gpg_program, strlist_t gpg_arguments, @@ -52,4 +51,4 @@ gpg_error_t gpg_decrypt_stream (ctrl_t ctrl, estream_t cipher_stream, estream_t plain_stream); -#endif /*G13_CALL_GPG_H*/ +#endif /*GNUPG_COMMON_CALL_GPG_H*/ |