vcpkg/ports/dpdk/0006-rename-sched.h.patch at bbda642285817d13650df697978e519c0af0b254 · microsoft/vcpkg · GitHub

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
diff --git a/lib/eal/common/eal_common_thread.c b/lib/eal/common/eal_common_thread.c
index dcd81f9..4daa244 100644
--- a/lib/eal/common/eal_common_thread.c
+++ b/lib/eal/common/eal_common_thread.c
@@ -6,7 +6,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <pthread.h>
+#ifdef _WIN32
+#include <sched_from_dpdk.h>
+#else
 #include <sched.h>
+#endif
 #include <assert.h>
 #include <string.h>

diff --git a/lib/eal/windows/include/meson.build b/lib/eal/windows/include/meson.build
index e985a77..dbd6b4b 100644
--- a/lib/eal/windows/include/meson.build
+++ b/lib/eal/windows/include/meson.build
@@ -6,5 +6,5 @@ includes += include_directories('.')
 headers += files(
         'rte_os.h',
         'rte_windows.h',
-        'sched.h',
+        'sched_from_dpdk.h',
 )
diff --git a/lib/eal/windows/include/pthread.h b/lib/eal/windows/include/pthread.h
index e1c3101..f28b37d 100644
--- a/lib/eal/windows/include/pthread.h
+++ b/lib/eal/windows/include/pthread.h
@@ -6,7 +6,7 @@
 #define _PTHREAD_H_

 #include <stdint.h>
-#include <sched.h>
+#include <sched_from_dpdk.h>

 /**
  * This file is required to support the common code in eal_common_proc.c,
diff --git a/lib/eal/windows/include/rte_os.h b/lib/eal/windows/include/rte_os.h
index 2a43cb1..440fa30 100644
--- a/lib/eal/windows/include/rte_os.h
+++ b/lib/eal/windows/include/rte_os.h
@@ -15,7 +15,7 @@
 #include <string.h>
 #include <malloc.h>

-#include <sched.h>
+#include <sched_from_dpdk.h>

 /* These macros are compatible with bundled sys/queue.h. */
 #define RTE_TAILQ_HEAD(name, type) \
diff --git a/lib/eal/windows/include/sched.h b/lib/eal/windows/include/sched_from_dpdk.h
similarity index 97%
rename from lib/eal/windows/include/sched.h
rename to lib/eal/windows/include/sched_from_dpdk.h
index 912fed1..400c927 100644
--- a/lib/eal/windows/include/sched.h
+++ b/lib/eal/windows/include/sched_from_dpdk.h
@@ -2,8 +2,8 @@
  * Copyright(c) 2019 Intel Corporation
  */

-#ifndef _SCHED_H_
-#define _SCHED_H_
+#ifndef _SCHED_FROM_DPDK_H_
+#define _SCHED_FROM_DPDK_H_

 /**
  * This file is added to support the common code in eal_common_thread.c