Commit 007e722c authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Paolo Bonzini
Browse files

build-sys: move windows defines in osdep.h header 



This removes some clutter in compilation logging, and allows some
easier tweaking per compilation unit/CFLAGS overriding.

Note that we can't move those define in os-win32.h, since they must be
set before the first system headers are included.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20181122110039.15972-3-marcandre.lureau@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 444e20a3

configure

+0 −3
Original line number Diff line number Diff line
@@ -912,9 +912,6 @@ fi 
if test "$mingw32" = "yes" ; then

  EXESUF=".exe"

  DSOSUF=".dll"

  QEMU_CFLAGS="-DWIN32_LEAN_AND_MEAN -DWINVER=0x501 $QEMU_CFLAGS"

  # enable C99/POSIX format strings (needs mingw32-runtime 3.15 or later)

  QEMU_CFLAGS="-D__USE_MINGW_ANSI_STDIO=1 $QEMU_CFLAGS"

  # MinGW needs -mthreads for TLS and macro _MT.

  QEMU_CFLAGS="-mthreads $QEMU_CFLAGS"

  LIBS="-lwinmm -lws2_32 -liphlpapi $LIBS"

include/qemu/osdep.h

+17 −0
Original line number Diff line number Diff line
@@ -74,13 +74,30 @@ typedef __float128 _Float128; 
extern int daemon(int, int);

#endif



#ifdef _WIN32

/* as defined in sdkddkver.h */

#ifndef WINVER

#define WINVER 0x0501 /* XP */

#endif

/* reduces the number of implicitly included headers */

#ifndef WIN32_LEAN_AND_MEAN

#define WIN32_LEAN_AND_MEAN

#endif

#endif



#include <stdarg.h>

#include <stddef.h>

#include <stdbool.h>

#include <stdint.h>

#include <sys/types.h>

#include <stdlib.h>



/* enable C99/POSIX format strings (needs mingw32-runtime 3.15 or later) */

#ifdef __MINGW32__

#define __USE_MINGW_ANSI_STDIO 1

#endif

#include <stdio.h>



#include <string.h>

#include <strings.h>

#include <inttypes.h>