[svn] gpgme - r1259 - in trunk: assuan gpgme

[svn author wk]

Author: wk
Date: 2007-09-25 17:08:14 +0200 (Tue, 25 Sep 2007)
New Revision: 1259

Modified:
   trunk/assuan/ChangeLog
   trunk/assuan/assuan.h
   trunk/gpgme/gpgme.h
Log:
Fixed a name clash under W32


Modified: trunk/assuan/ChangeLog
===================================================================
--- trunk/assuan/ChangeLog	2007-09-17 13:24:14 UTC (rev 1258)
+++ trunk/assuan/ChangeLog	2007-09-25 15:08:14 UTC (rev 1259)
@@ -1,3 +1,8 @@
+2007-09-25  Werner Koch  <wk at g10code.com>
+
+	* assuan.h (_assuan_gpg_strerror_r, _assuan_gpg_strsource): Add
+	new wrappers.
+
 2007-09-03  Marcus Brinkmann  <marcus at g10code.de>
 
 	* assuan.h [_ASSUAN_EXT_SYM_PREFIX]: Add missing symbol renames

Modified: trunk/assuan/assuan.h
===================================================================
--- trunk/assuan/assuan.h	2007-09-17 13:24:14 UTC (rev 1258)
+++ trunk/assuan/assuan.h	2007-09-25 15:08:14 UTC (rev 1259)
@@ -185,6 +185,8 @@
 #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)  

Modified: trunk/gpgme/gpgme.h
===================================================================
--- trunk/gpgme/gpgme.h	2007-09-17 13:24:14 UTC (rev 1258)
+++ trunk/gpgme/gpgme.h	2007-09-25 15:08:14 UTC (rev 1259)
@@ -73,7 +73,7 @@
    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"