diff options
| author | NIIBE Yutaka <[email protected]> | 2023-05-10 04:28:34 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2023-05-10 04:28:34 +0000 |
| commit | 295e33465eaefaf4c79e9ee2128d8ad821bf7ec5 (patch) | |
| tree | 0f3aed78f40fb354624de18a83dd6ec5f7960833 | |
| parent | w32: Fix the semantics of sending FD, it's Windows HANDLE. (diff) | |
| download | libassuan-295e33465eaefaf4c79e9ee2128d8ad821bf7ec5.tar.gz libassuan-295e33465eaefaf4c79e9ee2128d8ad821bf7ec5.zip | |
w32: Minor fixes for ifdef/endif for W32 and W64.
* src/assuan-defs.h: Fix.
* src/assuan-pipe-connect.c: Likewise.
* src/assuan-socket-connect.c: Likewise.
--
Signed-off-by: NIIBE Yutaka <[email protected]>
| -rw-r--r-- | src/assuan-defs.h | 2 | ||||
| -rw-r--r-- | src/assuan-pipe-connect.c | 2 | ||||
| -rw-r--r-- | src/assuan-socket-connect.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/assuan-defs.h b/src/assuan-defs.h index e92439d..e55e7c7 100644 --- a/src/assuan-defs.h +++ b/src/assuan-defs.h @@ -180,7 +180,7 @@ struct assuan_context_s int max_accepts; /* If we can not handle more than one connection, set this to 1, otherwise to -1. */ pid_t pid; /* The pid of the peer. */ -#if defined(HAVE_W64_SYSTEM) || defined(HAVE_W32_SYSTEM) +#if defined(HAVE_W32_SYSTEM) int process_id; /* process ID of the server for FD passing. */ #endif assuan_fd_t listen_fd; /* The fd we are listening on (used by diff --git a/src/assuan-pipe-connect.c b/src/assuan-pipe-connect.c index 3ac18e3..82a0aee 100644 --- a/src/assuan-pipe-connect.c +++ b/src/assuan-pipe-connect.c @@ -106,7 +106,7 @@ initial_handshake (assuan_context_t ctx) "can't connect server: %s", gpg_strerror (err)); else if (response == ASSUAN_RESPONSE_OK) { -#if defined(HAVE_W64_SYSTEM) || defined(HAVE_W32_SYSTEM) +#if defined(HAVE_W32_SYSTEM) const char *line = ctx->inbound.line + off; int process_id = -1; diff --git a/src/assuan-socket-connect.c b/src/assuan-socket-connect.c index d08a33e..182f9b3 100644 --- a/src/assuan-socket-connect.c +++ b/src/assuan-socket-connect.c @@ -132,7 +132,7 @@ _assuan_connect_finalize (assuan_context_t ctx, assuan_fd_t fd, "can't connect to server: %s\n", gpg_strerror (err)); else if (response == ASSUAN_RESPONSE_OK) { -#if defined(HAVE_W64_SYSTEM) || defined(HAVE_W32_SYSTEM) +#if defined(HAVE_W32_SYSTEM) const char *line = ctx->inbound.line + off; int process_id = -1; |