diff options
| author | Werner Koch <wk@gnupg.org> | 2013-06-26 11:09:42 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2013-06-26 11:11:32 +0200 |
| commit | 6540b84a6e9113813e7e49e3ad2024d4a0073300 (patch) | |
| tree | f0938b97cba75ba9a34c3eec6bf149abaa383992 /configure.ac | |
| parent | 3544fa8aa63bef9a35abf236e9376191b5ec206b (diff) | |
| download | libgcrypt-6540b84a6e9113813e7e49e3ad2024d4a0073300.tar.gz | |
Make gpg-error replacement defines more robust.
* configure.ac (AH_BOTTOM): Move GPG_ERR_ replacement defines to ...
* src/gcrypt-int.h: new file.
* src/visibility.h, src/cipher.h: Replace gcrypt.h by gcrypt-int.h.
* tests/: Ditto for all test files.
--
Defining newer gpg-error codes in config.h was not a good idea,
because config.h is usually included before gpg-error.h and thus
gpg-error.h would be double defines to lead to faulty code there like
typedef enum
{
[...]
191 = 191,
[...]
};
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index d9b16392..13541bbc 100644 --- a/configure.ac +++ b/configure.ac @@ -65,6 +65,8 @@ LIBGCRYPT_LT_REVISION=0 # If the API is changed in an incompatible way: increment the next counter. LIBGCRYPT_CONFIG_API_VERSION=1 +# If you change the required gpg-error version, please remove +# unnecessary error code defines in src/gcrypt-int.h. NEED_GPG_ERROR_VERSION=1.11 PACKAGE=$PACKAGE_NAME @@ -105,15 +107,6 @@ AH_BOTTOM([ properly prefixed. */ #define CAMELLIA_EXT_SYM_PREFIX _gcry_ -/* These error codes are used but not defined in the required - libgpg-error 1.11. Define them here. */ -#define GPG_ERR_NO_CRYPT_CTX 191 -#define GPG_ERR_WRONG_CRYPT_CTX 192 -#define GPG_ERR_BAD_CRYPT_CTX 193 -#define GPG_ERR_CRYPT_CTX_CONFLICT 194 -#define GPG_ERR_BROKEN_PUBKEY 195 -#define GPG_ERR_BROKEN_SECKEY 196 - #endif /*_GCRYPT_CONFIG_H_INCLUDED*/ ]) |