mirror of https://github.com/microsoft/vcpkg.git
72 lines
2.1 KiB
Diff
72 lines
2.1 KiB
Diff
diff --git a/lib/eal/common/eal_common_thread.c b/lib/eal/common/eal_common_thread.c
|
|
index a53bc63..087ec80 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 9d69467..4df82dd 100644
|
|
--- a/lib/eal/windows/include/rte_os.h
|
|
+++ b/lib/eal/windows/include/rte_os.h
|
|
@@ -14,7 +14,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
|