diff options
| author | Werner Koch <[email protected]> | 2007-09-25 15:08:14 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2007-09-25 15:08:14 +0000 |
| commit | 11df38d4655465b951696e2fcb6f995533a4011a (patch) | |
| tree | 041375cd9bf32c446a2ff0d611664e263020e815 | |
| parent | Bumbed version number (still svn, though) (diff) | |
| download | gpgme-11df38d4655465b951696e2fcb6f995533a4011a.tar.gz gpgme-11df38d4655465b951696e2fcb6f995533a4011a.zip | |
Fixed a name clash under W32
| -rw-r--r-- | assuan/ChangeLog | 5 | ||||
| -rw-r--r-- | assuan/assuan.h | 2 | ||||
| -rw-r--r-- | gpgme/gpgme.h | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/assuan/ChangeLog b/assuan/ChangeLog index 9878c65f..4b24712a 100644 --- a/assuan/ChangeLog +++ b/assuan/ChangeLog @@ -1,3 +1,8 @@ +2007-09-25 Werner Koch <[email protected]> + + * assuan.h (_assuan_gpg_strerror_r, _assuan_gpg_strsource): Add + new wrappers. + 2007-09-03 Marcus Brinkmann <[email protected]> * assuan.h [_ASSUAN_EXT_SYM_PREFIX]: Add missing symbol renames diff --git a/assuan/assuan.h b/assuan/assuan.h index cd3f2820..6df01667 100644 --- a/assuan/assuan.h +++ b/assuan/assuan.h @@ -185,6 +185,8 @@ int _gpgme_io_recvmsg (int sock, struct msghdr *msg, int flags); #define _assuan_set_default_log_stream \ _ASSUAN_PREFIX(_assuan_set_default_log_stream) #define _assuan_w32_strerror _ASSUAN_PREFIX(_assuan_w32_strerror) +#define _assuan_gpg_strerror_r _ASSUAN_PREFIX(_assuan_gpg_strerror_r) +#define _assuan_gpg_strsource _ASSUAN_PREFIX(_assuan_gpg_strsource) #define _assuan_write_line _ASSUAN_PREFIX(_assuan_write_line) #define _assuan_close _ASSUAN_PREFIX(_assuan_close) #define _assuan_sock_new _ASSUAN_PREFIX(_assuan_sock_new) diff --git a/gpgme/gpgme.h b/gpgme/gpgme.h index c5628009..a4dbcd4a 100644 --- a/gpgme/gpgme.h +++ b/gpgme/gpgme.h @@ -73,7 +73,7 @@ extern "C" { AM_PATH_GPGME macro) check that this header matches the installed library. Warning: Do not edit the next line. configure will do that for you! */ -#define GPGME_VERSION "1.1.6-svn1257" +#define GPGME_VERSION "1.1.6-svn1258" |