[4/8] reorder: build on Windows

Message ID 20221201014440.11896-5-stephen@networkplumber.org (mailing list archive)
State Superseded, archived
Delegated to: Thomas Monjalon
Headers
Series Enable building more on Windows |

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

Stephen Hemminger Dec. 1, 2022, 1:44 a.m. UTC
  This builds on Windows if sys/queue.h is included.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 app/test/test_reorder.c   | 11 -----------
 lib/reorder/meson.build   |  6 ------
 lib/reorder/rte_reorder.c |  1 +
 3 files changed, 1 insertion(+), 17 deletions(-)
  

Comments

Tyler Retzlaff Dec. 1, 2022, 11:53 p.m. UTC | #1
On Wed, Nov 30, 2022 at 05:44:35PM -0800, Stephen Hemminger wrote:
> This builds on Windows if sys/queue.h is included.
> 
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> ---

Acked-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
  

Patch

diff --git a/app/test/test_reorder.c b/app/test/test_reorder.c
index f0714a5c18a3..9ebd91477536 100644
--- a/app/test/test_reorder.c
+++ b/app/test/test_reorder.c
@@ -11,16 +11,6 @@ 
 #include <rte_cycles.h>
 #include <rte_errno.h>
 #include <rte_mbuf.h>
-
-#ifdef RTE_EXEC_ENV_WINDOWS
-static int
-test_reorder(void)
-{
-	printf("reorder not supported on Windows, skipping test\n");
-	return TEST_SKIPPED;
-}
-#else
-
 #include <rte_reorder.h>
 #include <rte_lcore.h>
 #include <rte_malloc.h>
@@ -395,6 +385,5 @@  test_reorder(void)
 	return unit_test_suite_runner(&reorder_test_suite);
 }
 
-#endif /* !RTE_EXEC_ENV_WINDOWS */
 
 REGISTER_TEST_COMMAND(reorder_autotest, test_reorder);
diff --git a/lib/reorder/meson.build b/lib/reorder/meson.build
index 621c1f350103..03aed53d9007 100644
--- a/lib/reorder/meson.build
+++ b/lib/reorder/meson.build
@@ -1,12 +1,6 @@ 
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-if is_windows
-    build = false
-    reason = 'not supported on Windows'
-    subdir_done()
-endif
-
 sources = files('rte_reorder.c')
 headers = files('rte_reorder.h')
 deps += ['mbuf']
diff --git a/lib/reorder/rte_reorder.c b/lib/reorder/rte_reorder.c
index 385ee479da42..00e2cf043e04 100644
--- a/lib/reorder/rte_reorder.c
+++ b/lib/reorder/rte_reorder.c
@@ -3,6 +3,7 @@ 
  */
 
 #include <string.h>
+#include <sys/queue.h>
 
 #include <rte_string_fns.h>
 #include <rte_log.h>