blob: 60c421b6ec68a412331d8d8c4c1eaeee94183822 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
--- src/assuan-handler.c
+++ src/assuan-handler.c
@@ -954,7 +954,7 @@
fdarray[n++] = ctx->outbound.fd;
if (ctx->outbound.data.fp)
#if defined(HAVE_W32_SYSTEM)
- fdarray[n++] = (void*)_get_osfhandle (fileno (ctx->outbound.data.fp));
+ fdarray[n++] = (void*)_get_osfhandle (_fileno (ctx->outbound.data.fp));
#else
fdarray[n++] = fileno (ctx->outbound.data.fp);
#endif
--- src/assuan-logging.c
+++ src/assuan-logging.c
@@ -30,10 +30,15 @@
# ifdef HAVE_WINSOCK2_H
# include <winsock2.h>
# endif
+# include <process.h>
+# define getpid _getpid
# include <windows.h>
#endif /*HAVE_W32_SYSTEM*/
#include <errno.h>
#include <ctype.h>
+#if defined HAVE_W32_SYSTEM
+#define isascii __isascii
+#endif
#include "assuan-defs.h"
--- src/assuan-pipe-connect.c
+++ src/assuan-pipe-connect.c
@@ -47,6 +47,8 @@
# ifdef HAVE_WINSOCK2_H
# include <winsock2.h>
# endif
+# include <process.h>
+# define getpid _getpid
# include <windows.h>
#endif
--- src/assuan-socket.c
+++ src/assuan-socket.c
@@ -27,6 +27,8 @@
#include <stdlib.h>
#ifdef HAVE_W32_SYSTEM
# define WIN32_LEAN_AND_MEAN
+# include <process.h>
+# define getpid _getpid
# include <windows.h>
# include <wincrypt.h>
# include <io.h>
--- src/conversion.c
+++ src/conversion.c
@@ -27,6 +27,9 @@
#include <string.h>
#include <errno.h>
#include <ctype.h>
+#if defined HAVE_W32_SYSTEM
+#define isascii __isascii
+#endif
#include "assuan-defs.h"
#include "debug.h"
--- src/system-w32.c
+++ src/system-w32.c
@@ -453,7 +453,7 @@
/* Dup stderr to /dev/null unless it is in the list of FDs to be
passed to the child. */
- fd = assuan_fd_from_posix_fd (fileno (stderr));
+ fd = assuan_fd_from_posix_fd (_fileno (stderr));
fdp = fd_child_list;
if (fdp)
{
|
