From 339954714f69bbd395aa9bbe46850dcaa98e9f29 Mon Sep 17 00:00:00 2001 From: Jannis Hoffmann Date: Thu, 11 Jul 2024 13:49:50 +0200 Subject: convert form make to meson Add .editorconfig. Removed unused fallback definitions (for POSIX systems). --- include/iopause.h | 16 +++------------- include/meson.build | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/select.h | 14 +------------- 3 files changed, 56 insertions(+), 26 deletions(-) create mode 100644 include/meson.build (limited to 'include') diff --git a/include/iopause.h b/include/iopause.h index 871c8eb..488c840 100644 --- a/include/iopause.h +++ b/include/iopause.h @@ -3,22 +3,12 @@ #define IOPAUSE_POLL +#include #include -#ifdef HAS_POLL_H - #include typedef struct pollfd iopause_fd; - #define IOPAUSE_READ POLLIN - #define IOPAUSE_WRITE POLLOUT -#else -typedef struct { - int fd; - short events; - short revents; -} iopause_fd; - #define IOPAUSE_READ 1 - #define IOPAUSE_WRITE 4 -#endif +#define IOPAUSE_READ POLLIN +#define IOPAUSE_WRITE POLLOUT #include "taia.h" diff --git a/include/meson.build b/include/meson.build new file mode 100644 index 0000000..42439fd --- /dev/null +++ b/include/meson.build @@ -0,0 +1,52 @@ +qlibs_inc = include_directories('.') + +qlibs_hdrs = [ + 'alloc.h', + 'base64.h', + 'buffer.h', + 'byte.h', + 'case.h', + 'cdbmake.h', + 'cdbread.h', + 'close.h', + 'constmap.h', + 'direntry.h', + 'dnsresolv.h', + 'env.h', + 'error.h', + 'exit.h', + 'fd.h', + 'fifo.h', + 'fmt.h', + 'genalloc.h', + 'getln.h', + 'getoptb.h', + 'iopause.h', + 'ip.h', + 'lock.h', + 'logmsg.h', + 'ndelay.h', + 'open.h', + 'pathexec.h', + 'prot.h', + 'readclose.h', + 'readwrite.h', + 'rename.h', + 'scan.h', + 'seek.h', + 'select.h', + 'sig.h', + 'socket_if.h', + 'stralloc.h', + 'str.h', + 'taia.h', + 'tai.h', + 'timeoutconn.h', + 'timeout.h', + 'uint_t.h', + 'wait.h', +] + +qlibs_hdr_subdir = 'fehqlibs' + +install_headers(qlibs_hdrs, subdir : qlibs_hdr_subdir) diff --git a/include/select.h b/include/select.h index 7257ddd..41bfcb7 100644 --- a/include/select.h +++ b/include/select.h @@ -1,13 +1 @@ -#ifndef SELECT_H -#define SELECT_H - -#include -#include - -#ifdef HAS_SELECT_H - #include -#endif - -extern int select(); - -#endif +#include -- cgit v1.2.3