Changes in libcfa/src/concurrency/io/call.cfa.in [290553a:4ab3cf9b]

File:

• libcfa/src/concurrency/io/call.cfa.in (modified) (2 diffs)

libcfa/src/concurrency/io/call.cfa.in

@@ -47 +47 @@
         #include "kernel/fwd.hfa"
 
-        static const __u8 REGULAR_FLAGS = 0
-                #if defined(CFA_HAVE_IOSQE_FIXED_FILE)
-                        | IOSQE_FIXED_FILE
-                #endif
-                #if defined(CFA_HAVE_IOSQE_IO_DRAIN)
-                        | IOSQE_IO_DRAIN
-                #endif
-                #if defined(CFA_HAVE_IOSQE_ASYNC)
-                        | IOSQE_ASYNC
-                #endif
-        ;
-
-        static const __u32 LINK_FLAGS = 0
-                #if defined(CFA_HAVE_IOSQE_IO_LINK)
-                        | IOSQE_IO_LINK
-                #endif
-                #if defined(CFA_HAVE_IOSQE_IO_HARDLINK)
-                        | IOSQE_IO_HARDLINK
-                #endif
-        ;
-
-        static const __u32 SPLICE_FLAGS = 0
-                #if defined(CFA_HAVE_SPLICE_F_FD_IN_FIXED)
-                        | SPLICE_F_FD_IN_FIXED
-                #endif
-        ;
+        #if defined(CFA_HAVE_IOSQE_FIXED_FILE) && defined(CFA_HAVE_IOSQE_IO_DRAIN) && defined(CFA_HAVE_IOSQE_ASYNC)
+                #define REGULAR_FLAGS (IOSQE_FIXED_FILE | IOSQE_IO_DRAIN | IOSQE_ASYNC)
+        #elif defined(CFA_HAVE_IOSQE_FIXED_FILE) && defined(CFA_HAVE_IOSQE_ASYNC)
+                #define REGULAR_FLAGS (IOSQE_FIXED_FILE | IOSQE_ASYNC)
+        #elif defined(CFA_HAVE_IOSQE_FIXED_FILE) && defined(CFA_HAVE_IOSQE_IO_DRAIN)
+                #define REGULAR_FLAGS (IOSQE_FIXED_FILE | IOSQE_IO_DRAIN)
+        #elif defined(CFA_HAVE_IOSQE_IO_DRAIN) && defined(CFA_HAVE_IOSQE_ASYNC)
+                #define REGULAR_FLAGS (IOSQE_IO_DRAIN | IOSQE_ASYNC)
+        #elif defined(CFA_HAVE_IOSQE_FIXED_FILE)
+                #define REGULAR_FLAGS (IOSQE_FIXED_FILE)
+        #elif defined(CFA_HAVE_IOSQE_IO_DRAIN)
+                #define REGULAR_FLAGS (IOSQE_IO_DRAIN)
+        #elif defined(CFA_HAVE_IOSQE_ASYNC)
+                #define REGULAR_FLAGS (IOSQE_ASYNC)
+        #else
+                #define REGULAR_FLAGS (0)
+        #endif
+
+        #if defined(CFA_HAVE_IOSQE_IO_LINK) && defined(CFA_HAVE_IOSQE_IO_HARDLINK)
+                #define LINK_FLAGS (IOSQE_IO_LINK | IOSQE_IO_HARDLINK)
+        #elif defined(CFA_HAVE_IOSQE_IO_LINK)
+                #define LINK_FLAGS (IOSQE_IO_LINK)
+        #elif defined(CFA_HAVE_IOSQE_IO_HARDLINK)
+                #define LINK_FLAGS (IOSQE_IO_HARDLINK)
+        #else
+                #define LINK_FLAGS (0)
+        #endif
+
+        #if defined(CFA_HAVE_SPLICE_F_FD_IN_FIXED)
+                #define SPLICE_FLAGS (SPLICE_F_FD_IN_FIXED)
+        #else
+                #define SPLICE_FLAGS (0)
+        #endif
 
         extern [* struct io_uring_sqe, __u32] __submit_alloc( struct __io_data & ring, __u64 data );
@@ -340 +347 @@
         # CFA_HAVE_IORING_OP_MADVISE
         Call('MADVISE', 'int madvise(void *addr, size_t length, int advice)', {
-                'addr': '(__u64)addr',
+                'addr': 'addr',
                 'len': 'length',
                 'fadvise_advice': 'advice'