Commit d5db2ec1 authored Feb 08, 2016 by Peter Maydell

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>

parent c964b660

include/qemu/osdep.h

+11 −0

Original line number	Diff line number	Diff line
		@@ -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>

util/oslib-posix.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -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,