On Wed, Apr 14, 2021 at 07:50:41PM +0100, Peter Maydell wrote: > On Wed, 14 Apr 2021 at 18:26, Daniel P. Berrangé <berra...@redhat.com> wrote: > > > > On Tue, Apr 13, 2021 at 06:08:49PM +0200, Paolo Bonzini wrote: > > > #ifdef _WIN32 > > > #include "sysemu/os-win32.h" > > > > This and os-posix.h both include other system headers. We don't currently > > have problem, so this is ok as the minimal fix for 6.0, but long term we > > need more work on this header to further narrow the extern {} block. > > Maybe we should just move all the system header includes out of > both os-posix.h and os-win32.h ? We already have one header file > we've treated that way (sys/wait.h). > > Alternatively we could leave os-win32.h and os-posix.h outside > osdep.h's extern block, and require that they both use an > extern block themselves for their declarations.
I'd be inclined towards the latter as I tihnk its reasonable for os-win32/posix.h to want to include system headers. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|