Re: [Qemu-devel] [PATCH 05/15] util: Clean up includes

[Peter Maydell <peter.maydell@linaro.org>]

On 29 January 2016 at 17:49, Peter Maydell <peter.maydell@linaro.org> wrote:
> Clean up includes so that osdep.h is included first and headers
> which it implies are not included manually.
>
> This commit was created with scripts/clean-includes.
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> diff --git a/util/oslib-posix.c b/util/oslib-posix.c
> index d25f671..b2b5e12 100644
> --- a/util/oslib-posix.c
> +++ b/util/oslib-posix.c
> @@ -30,7 +30,6 @@
>     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
> @@ -47,13 +46,12 @@ extern int daemon(int, int);
>  #  define QEMU_VMALLOC_ALIGN getpagesize()
>  #endif
>
> +#include "qemu/osdep.h"
>  #include <termios.h>
> -#include <unistd.h>
>  #include <termios.h>
>
>  #include <glib/gprintf.h>
>
> -#include "config-host.h"
>  #include "sysemu/sysemu.h"
>  #include "trace.h"
>  #include "qemu/sockets.h"

This bit isn't quite right, because it breaks the "suppress the OSX
warning about daemon()". I'm going to drop this hunk but otherwise apply.

thanks
-- PMM