From: Werner Koch <wk@gnupg.org>
Date: Tue, 25 Sep 2007 15:08:14 +0000 (+0000)
Subject: Fixed a name clash under W32
X-Git-Tag: gpgme-1.2.0@1385~125
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6d20b367cca73326387e93136d5738922c938f4e;p=gpgme.git

Fixed a name clash under W32
---

diff --git a/trunk/assuan/ChangeLog b/trunk/assuan/ChangeLog
index 9878c65..4b24712 100644
--- a/trunk/assuan/ChangeLog
+++ b/trunk/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/trunk/assuan/assuan.h b/trunk/assuan/assuan.h
index cd3f282..6df0166 100644
--- a/trunk/assuan/assuan.h
+++ b/trunk/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/trunk/gpgme/gpgme.h b/trunk/gpgme/gpgme.h
index c562800..a4dbcd4 100644
--- a/trunk/gpgme/gpgme.h
+++ b/trunk/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"