Fixed a name clash in internal symbols used only under W32.

6 files changed, 29 insertions, 6 deletions

diff --git a/NEWS b/NEWS
index a8d8da6..17c86f1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Noteworthy changes in version 1.0.4
+------------------------------------------------
+
+
 Noteworthy changes in version 1.0.3 (2007-08-24)
 ------------------------------------------------
 
diff --git a/configure.ac b/configure.ac
index 8db06d0..1fef60e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ min_automake_version="1.10"
 # Remember to change the version number immediately *after* a release.
 # Set my_issvn to "yes" for non-released code.  Remember to run an
 # "svn up" and "autogen.sh" right before creating a distribution.
-m4_define([my_version], [1.0.3])
+m4_define([my_version], [1.0.4])
 m4_define([my_issvn], [yes])
 
 m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
diff --git a/doc/assuan.texi b/doc/assuan.texi
index c3b965b..b580848 100644
--- a/doc/assuan.texi
+++ b/doc/assuan.texi
@@ -1518,7 +1518,7 @@ better suited.
 @end deftypefun
 
 
-@deftypefun int assuan_get_active_fds (@w{assuan_context_t @var{ctx}}, @w{int @var{what}}, @w{int *@var{fdarray}}, @w{int @var{fdarraysize}})
+@deftypefun int assuan_get_active_fds (@w{assuan_context_t @var{ctx}}, @w{int @var{what}}, @w{assuan_fd_t *@var{fdarray}}, @w{int @var{fdarraysize}})
 
 Return all active file descriptors for the context @var{ctx}.  This
 function can be used to select on the file descriptors and to call
diff --git a/src/ChangeLog b/src/ChangeLog
index 3b38307..7b43bef 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-25  Werner Koch  <[email protected]>
+
+	* assuan.h (_assuan_gpg_strerror_r, _assuan_gpg_strsource): Add
+	wrappers for these new internal functions.
+
 2007-09-24  Marcus Brinkmann  <[email protected]>
 
 	* assuan-uds.c (uds_reader) [HAVE_W32_SYSTEM]: Do not touch the
@@ -10,6 +15,10 @@
 	ctx->pid as handle.
 	(pipe_connect_w32): Save the spawned processes handle.
 
+2007-09-13  Werner Koch  <[email protected]>
+
+	* assuan-socket.c (_assuan_close): Add inactive debug outputs.
+
 2007-09-11  Marcus Brinkmann  <[email protected]>
 
 	* assuan.h: Use _WIN32 instead of HAVE_W32_SYSTEM.
diff --git a/src/assuan-socket.c b/src/assuan-socket.c
index 1a7827d..13f4e77 100644
--- a/src/assuan-socket.c
+++ b/src/assuan-socket.c
@@ -43,13 +43,21 @@
 int
 _assuan_close (assuan_fd_t fd)
 {
-#ifndef HAVE_W32_SYSTEM
-  return close (fd);
-#else
+#ifdef HAVE_W32_SYSTEM
   int rc = closesocket (HANDLE2SOCKET(fd));
+/*   if (rc) */
+/*     _assuan_log_printf ("_assuan_close(%p): closesocket failed: %d/%ld\n", */
+/*                         fd, rc, WSAGetLastError ()); */
   if (rc && WSAGetLastError () == WSAENOTSOCK)
-    rc = CloseHandle (fd);
+    {
+      rc = CloseHandle (fd);
+/*       if (rc) */
+/*         _assuan_log_printf ("_assuan_close(%p): CloseHandle failed: %d\n", */
+/*                             fd, rc ); */
+    }
   return rc;
+#else
+  return close (fd);
 #endif
 }
 
diff --git a/src/assuan.h b/src/assuan.h
index a625334..788a742 100644
--- a/src/assuan.h
+++ b/src/assuan.h
@@ -159,6 +159,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)