diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-02-08 19:08:10 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-02-16 14:29:28 +0000 |
| commit | d5db2ec1774642db7febda0fba1cb3d0b9ef7236 (patch) | |
| tree | 29ab4ec555b149b29a2b0e96e04f0badee0181d4 | |
| parent | c964b660223308150bb72c627b320c79372c7128 (diff) | |
oslib-posix.c: Move workaround for OSX daemon() deprecation to osdep.h
The right place for "work around issues with system headers" code
is osdep.h. Move the workaround for OSX's stdlib.h emitting a
deprecation warning for daemon() to that header.
This also fixes a problem where running clean-includes on
oslib-posix.c would erroneously remove the #include <stdlib.h>
from it, breaking the workaround.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
| -rw-r--r-- | include/qemu/osdep.h | 11 | ||||
| -rw-r--r-- | util/oslib-posix.c | 9 |
2 files changed, 11 insertions, 9 deletions
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 59a7f8deca..cc055c909e 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -27,6 +27,17 @@ #include "config-host.h" #include "qemu/compiler.h" + +/* The following block of code temporarily renames the daemon() function so the + * compiler does not see the warning associated with it in stdlib.h on OSX + */ +#ifdef __APPLE__ +#define daemon qemu_fake_daemon_function +#include <stdlib.h> +#undef daemon +extern int daemon(int, int); +#endif + #include <stdarg.h> #include <stddef.h> #include <stdbool.h> diff --git a/util/oslib-posix.c b/util/oslib-posix.c index d844387b79..7615be4e7a 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -26,15 +26,6 @@ * THE SOFTWARE. */ -/* The following block of code temporarily renames the daemon() function so the - compiler does not see the warning associated with it in stdlib.h on OSX */ -#ifdef __APPLE__ -#define daemon qemu_fake_daemon_function -#include <stdlib.h> -#undef daemon -extern int daemon(int, int); -#endif - #if defined(__linux__) && (defined(__x86_64__) || defined(__arm__)) /* Use 2 MiB alignment so transparent hugepages can be used by KVM. Valgrind does not support alignments larger than 1 MiB, |