From 82aaa6ab76b323ccc28549285e692baa4c1e0864 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Thu, 10 Jun 2010 17:55:22 +0000 Subject: [PATCH] 2010-06-10 Marcus Brinkmann * sysutils.c (translate_sys2libc_fd) [HAVE_W32CE_SYSTEM]: Implement. (translate_sys2libc_fd_int) [HAVE_W32CE_SYSTEM]: Don't call translate_sys2libc_fd. --- common/ChangeLog | 5 +++++ common/sysutils.c | 6 ++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/common/ChangeLog b/common/ChangeLog index f46b4bb7d..0a4f57385 100644 --- a/common/ChangeLog +++ b/common/ChangeLog @@ -1,5 +1,10 @@ 2010-06-10 Marcus Brinkmann + * sysutils.c (translate_sys2libc_fd) [HAVE_W32CE_SYSTEM]: + Implement. + (translate_sys2libc_fd_int) [HAVE_W32CE_SYSTEM]: Don't call + translate_sys2libc_fd. + * estream.c (_es_get_std_stream): Fix cut&paste bug. 2010-06-09 Werner Koch diff --git a/common/sysutils.c b/common/sysutils.c index 50f70b043..ef180220a 100644 --- a/common/sysutils.c +++ b/common/sysutils.c @@ -280,8 +280,7 @@ int translate_sys2libc_fd (gnupg_fd_t fd, int for_write) { #if defined(HAVE_W32CE_SYSTEM) - (void)for_write; - return (int)fd; + return (int) _assuan_w32ce_finish_pipe ((int)fd, for_write); #elif defined(HAVE_W32_SYSTEM) int x; @@ -308,8 +307,7 @@ int translate_sys2libc_fd_int (int fd, int for_write) { #if HAVE_W32CE_SYSTEM - fd = (int) _assuan_w32ce_finish_pipe (fd, for_write); - return translate_sys2libc_fd ((void*)fd, for_write); + return (int) _assuan_w32ce_finish_pipe (fd, for_write); #elif HAVE_W32_SYSTEM if (fd <= 2) return fd; /* Do not do this for error, stdin, stdout, stderr. */