-
Notifications
You must be signed in to change notification settings - Fork 5
/
Copy pathqubes-vmm-xen-win-pvdrivers-xeniface-mingw.patch
65 lines (61 loc) · 1.72 KB
/
qubes-vmm-xen-win-pvdrivers-xeniface-mingw.patch
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
diff --git a/include/xencontrol.h b/include/xencontrol.h
index 4560bc6..2ef2e22 100644
--- a/include/xencontrol.h
+++ b/include/xencontrol.h
@@ -2,7 +2,11 @@
#define _XENCONTROL_H_
#include <windows.h>
+#ifdef __MINGW32__
+#include <stdarg.h>
+#else
#include <varargs.h>
+#endif
#include "xeniface_ioctls.h"
#ifdef XENCONTROL_EXPORTS
diff --git a/src/xencontrol/xencontrol.c b/src/xencontrol/xencontrol.c
index f55d0a2..1504ddf 100644
--- a/src/xencontrol/xencontrol.c
+++ b/src/xencontrol/xencontrol.c
@@ -1,6 +1,8 @@
#define INITGUID
#include <windows.h>
+#ifndef __MINGW32__
#include <winioctl.h>
+#endif
#include <setupapi.h>
#include <stdlib.h>
#include <assert.h>
@@ -26,7 +28,7 @@ _Log(
IN XENCONTROL_LOGGER *Logger,
IN XENCONTROL_LOG_LEVEL LogLevel,
IN XENCONTROL_LOG_LEVEL CurrentLogLevel,
- IN PCHAR Function,
+ IN LPCSTR Function,
IN PWCHAR Format,
...
)
@@ -50,7 +52,7 @@ _Log(
static void
_LogMultiSz(
IN PXENCONTROL_CONTEXT Xc,
- IN PCHAR Caller,
+ IN LPCSTR Caller,
IN XENCONTROL_LOG_LEVEL Level,
IN PCHAR MultiSz
)
diff --git a/src/xencontrol/xencontrol_private.h b/src/xencontrol/xencontrol_private.h
index 685bcfa..92609d9 100644
--- a/src/xencontrol/xencontrol_private.h
+++ b/src/xencontrol/xencontrol_private.h
@@ -4,8 +4,13 @@
#include <windows.h>
#include "xencontrol.h"
+#ifdef __MINGW32__
+#define Log(level, format, ...) \
+ _Log(Xc->Logger, level, Xc->LogLevel, __FUNCTION__, format, ##__VA_ARGS__)
+#else
#define Log(level, format, ...) \
_Log(Xc->Logger, level, Xc->LogLevel, __FUNCTION__, format, __VA_ARGS__)
+#endif
#define InitializeListHead(ListHead) ( \
(ListHead)->Flink = (ListHead)->Blink = (ListHead))