[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 3/9] osdep.h: Remove <sys/signal.h> include
From: |
Jiaxun Yang |
Subject: |
[PATCH v2 3/9] osdep.h: Remove <sys/signal.h> include |
Date: |
Mon, 18 Jan 2021 14:38:02 +0800 |
From: Michael Forney <mforney@mforney.org>
Prior to 2a4b472c3c, sys/signal.h was only included on OpenBSD
(apart from two .c files). The POSIX standard location for this
header is just <signal.h> and in fact, OpenBSD's signal.h includes
sys/signal.h itself.
Unconditionally including <sys/signal.h> on musl causes warnings
for just about every source file:
/usr/include/sys/signal.h:1:2: warning: #warning redirecting incorrect
#include <sys/signal.h> to <signal.h> [-Wcpp]
1 | #warning redirecting incorrect #include <sys/signal.h> to <signal.h>
| ^~~~~~~
Since there don't seem to be any platforms which require including
<sys/signal.h> in addition to <signal.h>, and some platforms like
Haiku lack it completely, just remove it.
Tested building on OpenBSD after removing this include.
Signed-off-by: Michael Forney <mforney@mforney.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
[jiaxun.yang@flygoat.com: Move to meson]
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
meson.build | 1 -
include/qemu/osdep.h | 4 ----
2 files changed, 5 deletions(-)
diff --git a/meson.build b/meson.build
index 3d889857a0..af2bc89741 100644
--- a/meson.build
+++ b/meson.build
@@ -1113,7 +1113,6 @@ config_host_data.set('HAVE_DRM_H',
cc.has_header('libdrm/drm.h'))
config_host_data.set('HAVE_PTY_H', cc.has_header('pty.h'))
config_host_data.set('HAVE_SYS_IOCCOM_H', cc.has_header('sys/ioccom.h'))
config_host_data.set('HAVE_SYS_KCOV_H', cc.has_header('sys/kcov.h'))
-config_host_data.set('HAVE_SYS_SIGNAL_H', cc.has_header('sys/signal.h'))
ignored = ['CONFIG_QEMU_INTERP_PREFIX'] # actually per-target
arrays = ['CONFIG_AUDIO_DRIVERS', 'CONFIG_BDRV_RW_WHITELIST',
'CONFIG_BDRV_RO_WHITELIST']
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index f9ec8c84e9..a434382c58 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -104,10 +104,6 @@ extern int daemon(int, int);
#include <setjmp.h>
#include <signal.h>
-#ifdef HAVE_SYS_SIGNAL_H
-#include <sys/signal.h>
-#endif
-
#ifndef _WIN32
#include <sys/wait.h>
#else
--
2.30.0
- [PATCH v2 0/9] Alpine Linux build fix and CI pipeline, Jiaxun Yang, 2021/01/18
- [PATCH v2 1/9] configure: Add sys/timex.h to probe clock_adjtime, Jiaxun Yang, 2021/01/18
- [PATCH v2 2/9] libvhost-user: Include poll.h instead of sys/poll.h, Jiaxun Yang, 2021/01/18
- [PATCH v2 3/9] osdep.h: Remove <sys/signal.h> include,
Jiaxun Yang <=
- [PATCH v2 4/9] hw/block/nand: Rename PAGE_SIZE to NAND_PAGE_SIZE, Jiaxun Yang, 2021/01/18
- [PATCH v2 5/9] elf2dmp: Rename PAGE_SIZE to ELF2DMP_PAGE_SIZE, Jiaxun Yang, 2021/01/18
- [PATCH v2 6/9] tests: Rename PAGE_SIZE definitions, Jiaxun Yang, 2021/01/18
- [PATCH v2 7/9] accel/kvm: avoid using predefined PAGE_SIZE, Jiaxun Yang, 2021/01/18
- [PATCH v2 8/9] tests/docker: Add dockerfile for Alpine Linux, Jiaxun Yang, 2021/01/18