Fixed a name clash under W32

This commit is contained in:
Werner Koch 2007-09-25 15:08:14 +00:00
parent 496fa48ffd
commit 11df38d465
3 changed files with 8 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2007-09-25 Werner Koch <wk@g10code.com>
* assuan.h (_assuan_gpg_strerror_r, _assuan_gpg_strsource): Add
new wrappers.
2007-09-03 Marcus Brinkmann <marcus@g10code.de> 2007-09-03 Marcus Brinkmann <marcus@g10code.de>
* assuan.h [_ASSUAN_EXT_SYM_PREFIX]: Add missing symbol renames * assuan.h [_ASSUAN_EXT_SYM_PREFIX]: Add missing symbol renames

View File

@ -185,6 +185,8 @@ int _gpgme_io_recvmsg (int sock, struct msghdr *msg, int flags);
#define _assuan_set_default_log_stream \ #define _assuan_set_default_log_stream \
_ASSUAN_PREFIX(_assuan_set_default_log_stream) _ASSUAN_PREFIX(_assuan_set_default_log_stream)
#define _assuan_w32_strerror _ASSUAN_PREFIX(_assuan_w32_strerror) #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_write_line _ASSUAN_PREFIX(_assuan_write_line)
#define _assuan_close _ASSUAN_PREFIX(_assuan_close) #define _assuan_close _ASSUAN_PREFIX(_assuan_close)
#define _assuan_sock_new _ASSUAN_PREFIX(_assuan_sock_new) #define _assuan_sock_new _ASSUAN_PREFIX(_assuan_sock_new)

View File

@ -73,7 +73,7 @@ extern "C" {
AM_PATH_GPGME macro) check that this header matches the installed AM_PATH_GPGME macro) check that this header matches the installed
library. Warning: Do not edit the next line. configure will do library. Warning: Do not edit the next line. configure will do
that for you! */ that for you! */
#define GPGME_VERSION "1.1.6-svn1257" #define GPGME_VERSION "1.1.6-svn1258"