From 012f1bdc87e9969131c72c5575af0851484a2196 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 28 Feb 2017 12:29:41 +0100 Subject: New public header gpgrt.h as alias for gpg-error.h * src/gpg-error.h.in (GPGRT_H): New double include protection. * src/Makefile.am (nodist_include_HEADERS): Add gpgrt.h. (BUILT_SOURCES): Ditto. (CLEANFILES): Ditto. (gpgrt.h): New rule. Signed-off-by: Werner Koch --- src/Makefile.am | 9 ++++++--- src/gpg-error.h.in | 5 ++++- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 06ba1cd..4c77521 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -80,7 +80,7 @@ lock_obj_pub = \ lib_LTLIBRARIES = libgpg-error.la -nodist_include_HEADERS = gpg-error.h +nodist_include_HEADERS = gpg-error.h gpgrt.h bin_SCRIPTS = gpg-error-config m4datadir = $(datadir)/aclocal m4data_DATA = gpg-error.m4 @@ -95,13 +95,14 @@ EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \ $(lock_obj_pub) BUILT_SOURCES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \ - err-sources-sym.h err-codes-sym.h errnos-sym.h gpg-error.h \ + err-sources-sym.h err-codes-sym.h errnos-sym.h gpg-error.h gpgrt.h \ gpg-error.def mkw32errmap.map.c tmp_files = _mkerrcodes.h _gpg-error.def.h mkw32errmap.tab.h mkw32errmap.map.c CLEANFILES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \ - gpg-error.h mkerrcodes mkerrcodes.h gpg-error.def mkw32errmap.tab.h \ + gpg-error.h gpgrt.h \ + mkerrcodes mkerrcodes.h gpg-error.def mkw32errmap.tab.h \ mkw32errmap.map.c err-sources-sym.h err-codes-sym.h errnos-sym.h \ gpg-extra/errno.h mkheader $(tmp_files) lock-obj-pub.native.h @@ -305,6 +306,8 @@ gpg-error.h: Makefile mkheader $(parts_of_gpg_error_h) \ ./mkheader $(host_os) $(host_triplet) $(srcdir)/gpg-error.h.in \ ../config.h $(PACKAGE_VERSION) $(VERSION_NUMBER) >$@ +gpgrt.h: gpg-error.h + cp gpg-error.h gpgrt.h install-data-local: if HAVE_W32CE_SYSTEM diff --git a/src/gpg-error.h.in b/src/gpg-error.h.in index 19bdeed..4c7ac45 100644 --- a/src/gpg-error.h.in +++ b/src/gpg-error.h.in @@ -1,4 +1,4 @@ -/* gpg-error.h - Public interface to libgpg-error. -*- c -*- +/* gpg-error.h or gpgrt.h - Public interface to libgpg-error. -*- c -*- * Copyright (C) 2003, 2004, 2010, 2013, 2014, 2015, 2016 g10 Code GmbH * * This file is part of libgpg-error. @@ -21,6 +21,8 @@ #ifndef GPG_ERROR_H #define GPG_ERROR_H 1 +#ifndef GPGRT_H +#define GPGRT_H 1 #include #include @@ -867,4 +869,5 @@ gpg_error_t gpgrt_b64dec_finish (gpgrt_b64state_t state); #ifdef __cplusplus } #endif +#endif /* GPGRT_H */ #endif /* GPG_ERROR_H */ -- cgit v1.2.3