Add setup.h include

Some versions of clang warn that ____io_uring_queue_init_params() should be static when compiling setup.c, since there's no external declaration of it. We do have one in helpers.h, but add setup.h instead and include that from both the helpers and setup side. Fixes: 3401b06 ("setup: default to IORING_SETUP_NO_SQARRAY") Signed-off-by: Jens Axboe <[email protected]>
axboe · Oct 18, 2023 · b9cbcd5 · b9cbcd5
1 parent 3401b06
commit b9cbcd5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/setup.c b/src/setup.c
@@ -5,6 +5,7 @@
 #include "syscall.h"
 #include "liburing.h"
 #include "int_flags.h"
+#include "setup.h"
 #include "liburing/compat.h"
 #include "liburing/io_uring.h"
 

diff --git a/src/setup.h b/src/setup.h
@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: MIT */
+#ifndef LIBURING_SETUP_H
+#define LIBURING_SETUP_H
+
+int __io_uring_queue_init_params(unsigned entries, struct io_uring *ring,
+				 struct io_uring_params *p, void *buf,
+				 size_t buf_size);
+
+#endif
diff --git a/test/helpers.h b/test/helpers.h
@@ -10,6 +10,7 @@ extern "C" {
 #endif
 
 #include "liburing.h"
+#include "../src/setup.h"
 #include <arpa/inet.h>
 
 enum t_setup_ret {
@@ -87,10 +88,6 @@ bool t_probe_defer_taskrun(void);
 
 unsigned __io_uring_flush_sq(struct io_uring *ring);
 
-int __io_uring_queue_init_params(unsigned entries, struct io_uring *ring,
-				 struct io_uring_params *p, void *buf,
-				 size_t buf_size);
-
 static inline int t_io_uring_init_sqarray(unsigned entries, struct io_uring *ring,
 					struct io_uring_params *p)
 {