diff options
| author | Marcus Brinkmann <mb@g10code.com> | 2003-06-01 18:31:55 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <mb@g10code.com> | 2003-06-01 18:31:55 +0000 |
| commit | 1316051181294dc4398fcb31b27e7389b32f079f (patch) | |
| tree | b50f5321b7eb58a02907c347d5defbc705de17a0 | |
| parent | 1f385ac1ab20a1d3735433f7b31b6b6280414596 (diff) | |
| download | libgpg-error-1316051181294dc4398fcb31b27e7389b32f079f.tar.gz | |
2003-06-01 Marcus Brinkmann <marcus@g10code.de>
* src/Makefile.am (nobase_include_HEADERS): Rename target to ...
(include_HEADERS): ... this. Change file to gpg-error.h
(libgpg_error_la_SOURCES): Change gpg/error.h to gpg-error.h.
* src/gpg/error.h: Move to ...
* src/gpg-error.h: ... here. New file.
* src/strerror.c: Include <gpg-error.h>, not <gpg/error.h>.
* src/strsource.c: Likewise.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/gpg-error.h (renamed from src/gpg/error.h) | 2 | ||||
| -rw-r--r-- | src/strerror.c | 2 | ||||
| -rw-r--r-- | src/strsource.c | 2 |
5 files changed, 13 insertions, 5 deletions
@@ -1,5 +1,13 @@ 2003-06-01 Marcus Brinkmann <marcus@g10code.de> + * src/Makefile.am (nobase_include_HEADERS): Rename target to ... + (include_HEADERS): ... this. Change file to gpg-error.h + (libgpg_error_la_SOURCES): Change gpg/error.h to gpg-error.h. + * src/gpg/error.h: Move to ... + * src/gpg-error.h: ... here. New file. + * src/strerror.c: Include <gpg-error.h>, not <gpg/error.h>. + * src/strsource.c: Likewise. + * src/gpg/error.h (gpg_error_t): Change type to unsigned int, not long. diff --git a/src/Makefile.am b/src/Makefile.am index 76b2b5b..653e15b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,14 +21,14 @@ EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in BUILT_SOURCES = err-sources.h err-codes.h CLEANFILES = err-sources.h err-codes.h -nobase_include_HEADERS = gpg/error.h +include_HEADERS = gpg-error.h lib_LTLIBRARIES = libgpg-error.la libgpg_error_la_LDFLAGS = -version-info \ @LIBGPG_ERROR_LT_CURRENT@:@LIBGPG_ERROR_LT_REVISION@:@LIBGPG_ERROR_LT_AGE@ -libgpg_error_la_SOURCES = gpg/error.h gettext.h \ +libgpg_error_la_SOURCES = gpg-error.h gettext.h \ err-sources.h strsource.c err-codes.h strerror.c libgpg_error_la_LIBADD = @LTLIBINTL@ diff --git a/src/gpg/error.h b/src/gpg-error.h index 1d75a2b..938bf6e 100644 --- a/src/gpg/error.h +++ b/src/gpg-error.h @@ -1,4 +1,4 @@ -/* gpg/error.h - Public interface to libgpg-error. +/* gpg-error.h - Public interface to libgpg-error. Copyright (C) 2003 g10 Code GmbH This file is part of libgpg-error. diff --git a/src/strerror.c b/src/strerror.c index 8f78018..f0fb9e9 100644 --- a/src/strerror.c +++ b/src/strerror.c @@ -22,7 +22,7 @@ #include <config.h> #endif -#include <gpg/error.h> +#include <gpg-error.h> #include "gettext.h" #include "err-codes.h" diff --git a/src/strsource.c b/src/strsource.c index 1d31ee2..bb5fae3 100644 --- a/src/strsource.c +++ b/src/strsource.c @@ -22,7 +22,7 @@ #include <config.h> #endif -#include <gpg/error.h> +#include <gpg-error.h> #include "gettext.h" #include "err-sources.h" |