From e3b1e3857e00c6e8216e953b0b38f4dcda00cd53 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Wed, 31 Aug 2022 14:18:24 +0900 Subject: Drop WindowsCE support. * contrib/*: Remove. * Makefile.am (EXTRA_DIST): Don't include contrib/. * configure.ac (HAVE_W32CE_SYSTEM): Remove. * src/gpgcedev.c: Remove. * src/gpgcedev.def: Remove. * src/gpgcemgr.c: Remove. * src/system-w32ce.c: Remove. * src/w32ce-add.h: Remove. * src/w32ce-fd-t.inc.h: Remove. * src/Makefile.am (EXTRA_DIST, parts_of_assuan_h, common_sources): Fix. * src/assuan-buffer.c [HAVE_W32CE_SYSTEM]: No conditionalize. * src/setenv.c [HAVE_W32CE_SYSTEM]: Likewise. * src/assuan-defs.h [HAVE_W32CE_SYSTEM]: Remove dependent part. * src/assuan-error.c [HAVE_W32CE_SYSTEM]: Likewise. * src/assuan-handler.c [HAVE_W32CE_SYSTEM]: Likewise. * src/assuan-socket.c [HAVE_W32CE_SYSTEM]: Likewise. * src/system.c [HAVE_W32CE_SYSTEM]: Likewise. * src/sysutils.c [HAVE_W32CE_SYSTEM]: Likewise. * tests/Makefile.am (EXTRA_DIST): Fix. (w32cetools): Remove. * tests/common.h [HAVE_W32CE_SYSTEM]: Remove dependent part. * tests/pipeconnect.c [HAVE_W32CE_SYSTEM]: Likewise. * tests/ce-createpipe.c: Remove. * tests/ce-server.c: Remove. -- GnuPG-bug-id: 6170 Signed-off-by: NIIBE Yutaka --- src/assuan-handler.c | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) (limited to 'src/assuan-handler.c') diff --git a/src/assuan-handler.c b/src/assuan-handler.c index a572b62..126eccb 100644 --- a/src/assuan-handler.c +++ b/src/assuan-handler.c @@ -311,16 +311,6 @@ std_handler_input (assuan_context_t ctx, char *line) if (rc) return PROCESS_DONE (ctx, rc); -#ifdef HAVE_W32CE_SYSTEM - oldfd = fd; - fd = _assuan_w32ce_finish_pipe ((int)fd, 0); - if (fd == INVALID_HANDLE_VALUE) - return PROCESS_DONE (ctx, set_error (ctx, GPG_ERR_ASS_PARAMETER, - "rvid conversion failed")); - TRACE2 (ctx, ASSUAN_LOG_SYSIO, "std_handler_input", ctx, - "turned RVID 0x%x into handle 0x%x", oldfd, fd); -#endif - if (ctx->input_notify_fnc) { oldfd = ctx->input_fd; @@ -352,16 +342,6 @@ std_handler_output (assuan_context_t ctx, char *line) if (rc) return PROCESS_DONE (ctx, rc); -#ifdef HAVE_W32CE_SYSTEM - oldfd = fd; - fd = _assuan_w32ce_finish_pipe ((int)fd, 1); - if (fd == INVALID_HANDLE_VALUE) - return PROCESS_DONE (ctx, set_error (ctx, gpg_err_code_from_syserror (), - "rvid conversion failed")); - TRACE2 (ctx, ASSUAN_LOG_SYSIO, "std_handler_output", ctx, - "turned RVID 0x%x into handle 0x%x", oldfd, fd); -#endif - if (ctx->output_notify_fnc) { oldfd = ctx->output_fd; @@ -935,9 +915,7 @@ assuan_get_active_fds (assuan_context_t ctx, int what, if (ctx->outbound.fd != ASSUAN_INVALID_FD) fdarray[n++] = ctx->outbound.fd; if (ctx->outbound.data.fp) -#if defined(HAVE_W32CE_SYSTEM) - fdarray[n++] = (void*)fileno (ctx->outbound.data.fp); -#elif defined(HAVE_W32_SYSTEM) +#if defined(HAVE_W32_SYSTEM) fdarray[n++] = (void*)_get_osfhandle (fileno (ctx->outbound.data.fp)); #else fdarray[n++] = fileno (ctx->outbound.data.fp); -- cgit v1.2.3