Fixed a name clash under W32

diff --git a/assuan/ChangeLog b/assuan/ChangeLog
index 9878c65f7c86c80c4e63d5e9b98af92614be9429..4b24712a057d50c6d2c7d642e4e2ae651ac9fc96 100644 (file)
--- a/assuan/ChangeLog
+++ b/assuan/ChangeLog
@@ -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>
 
        * assuan.h [_ASSUAN_EXT_SYM_PREFIX]: Add missing symbol renames

diff --git a/assuan/assuan.h b/assuan/assuan.h
index cd3f2820262325ca3f9bbf681fbe57c3728cc788..6df016671b6d2ed6cb7477cab27da9433651d5d0 100644 (file)
--- 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 c5628009185ecc43bd5bbec334f2ae3d6f7f77a4..a4dbcd4a339a89bf275c745e629d273da9f4fc75 100644 (file)
--- 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"
 
 
 \f