Stefan Weil <s...@weilnetz.de> writes: > Including windows.h from the new file include/qemu/winapi.h allows > better tracking of the files which depend on the Windows API. > > 1864 *.o files depend on windows.h in a typical build, only 88 *.o files > don't. > > The windows.h specific macro WIN32_LEAN_AND_MEAN is now defined in the new > file and no longer part of the QEMU_CFLAGS. A hack in ui/sdl.c can be > removed after this change. > > WINVER is still needed for all compilations with MinGW, so it cannot be > defined in the new file. Replace its numeric value by a symbolic value to > show which API is requested. [...] > diff --git a/block/raw-win32.c b/block/raw-win32.c > index ae1c8e6..95b27a5 100644 > --- a/block/raw-win32.c > +++ b/block/raw-win32.c > @@ -23,13 +23,13 @@ > */ > #include "qemu-common.h" > #include "qemu/timer.h" > +#include "qemu/winapi.h" /* HANDLE (in raw-aio.h) */
Such comments get out of date real fast. I treat them as noise. If raw-aio.h needs stuff from winapi.h, why doesn't raw-aio.h include it? > #include "block/block_int.h" > #include "qemu/module.h" > #include "raw-aio.h" > #include "trace.h" > #include "block/thread-pool.h" > #include "qemu/iov.h" > -#include <windows.h> > #include <winioctl.h> > > #define FTYPE_FILE 0 [...]