[Qemu-devel] [PATCH v3 16/42] i386/hax: remove duplicated include

Philippe Mathieu-Daudé posted 42 patches 8 years, 3 months ago
There is a newer version of this series
[Qemu-devel] [PATCH v3 16/42] i386/hax: remove duplicated include
Posted by Philippe Mathieu-Daudé 8 years, 3 months ago
this file in include in "target/i386/hax-i386.h":

    #ifdef CONFIG_WIN32
    #include "target/i386/hax-windows.h"
    #endif

which guaranty than sysemu/os-win32.h is previously included (CONFIG_WIN32)

Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 target/i386/hax-windows.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/target/i386/hax-windows.h b/target/i386/hax-windows.h
index f7c3e99246..004f867694 100644
--- a/target/i386/hax-windows.h
+++ b/target/i386/hax-windows.h
@@ -20,7 +20,6 @@
 #ifndef TARGET_I386_HAX_WINDOWS_H
 #define TARGET_I386_HAX_WINDOWS_H
 
-#include <windows.h>
 #include <memory.h>
 #include <malloc.h>
 #include <winioctl.h>
-- 
2.15.0.rc0


Re: [Qemu-devel] [PATCH v3 16/42] i386/hax: remove duplicated include
Posted by Thomas Huth 8 years, 3 months ago
On 17.10.2017 18:44, Philippe Mathieu-Daudé wrote:
> this file in include in "target/i386/hax-i386.h":
> 
>     #ifdef CONFIG_WIN32
>     #include "target/i386/hax-windows.h"
>     #endif
> 
> which guaranty than sysemu/os-win32.h is previously included (CONFIG_WIN32)

which guaranties that ... ?

 Thomas

Re: [Qemu-devel] [PATCH v3 16/42] i386/hax: remove duplicated include
Posted by Philippe Mathieu-Daudé 8 years, 3 months ago
On 10/18/2017 09:12 AM, Thomas Huth wrote:
> On 17.10.2017 18:44, Philippe Mathieu-Daudé wrote:
>> this file in include in "target/i386/hax-i386.h":
>>
>>     #ifdef CONFIG_WIN32
>>     #include "target/i386/hax-windows.h"
>>     #endif
>>
>> which guaranty than sysemu/os-win32.h is previously included (CONFIG_WIN32)
> 
> which guaranties that ... ?

Oh :(
Michael if you take the whole series, do you mind changing this
description or do you want me to respin it? (if there is no further
functional change asked).

Regards,

Phil.