Message ID | 20180207160302.15651-1-eblake@redhat.com |
---|---|
State | New |
Headers | show |
Series | Drop unneeded system header includes | expand |
On 02/07/2018 01:03 PM, Eric Blake wrote: > <memory.h> is a non-standard obsolete header that was long ago > replaced by <string.h>. > > <malloc.h> is a non-standard header; it is not obsolete (we must > use it for malloc_trim, for example), but generally should not > be used in files that just need malloc() and friends, where > <stdlib.h> is the standard header. > > And since osdep.h already guarantees string.h and stdlib.h, we > can drop these unusual system header includes as redundant > rather than replacing them. > > Signed-off-by: Eric Blake <eblake@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > > Based-on: <20180207124009.12376-1-armbru@redhat.com> > ([PULL 00/20] Miscellaneous patches for 2018-02-07) > > target/i386/hax-windows.h | 2 -- > target/i386/hvf/x86_mmu.c | 1 - > 2 files changed, 3 deletions(-) > > diff --git a/target/i386/hax-windows.h b/target/i386/hax-windows.h > index 004f8676949..20e2f85407b 100644 > --- a/target/i386/hax-windows.h > +++ b/target/i386/hax-windows.h > @@ -20,8 +20,6 @@ > #ifndef TARGET_I386_HAX_WINDOWS_H > #define TARGET_I386_HAX_WINDOWS_H > > -#include <memory.h> > -#include <malloc.h> > #include <winioctl.h> > #include <windef.h> > > diff --git a/target/i386/hvf/x86_mmu.c b/target/i386/hvf/x86_mmu.c > index c6be2cca357..d5a0efe7188 100644 > --- a/target/i386/hvf/x86_mmu.c > +++ b/target/i386/hvf/x86_mmu.c > @@ -17,7 +17,6 @@ > */ > > #include "qemu/osdep.h" > -#include <memory.h> > #include "panic.h" > #include "qemu-common.h" > #include "cpu.h" >
On 07.02.2018 17:03, Eric Blake wrote: > <memory.h> is a non-standard obsolete header that was long ago > replaced by <string.h>. > > <malloc.h> is a non-standard header; it is not obsolete (we must > use it for malloc_trim, for example), but generally should not > be used in files that just need malloc() and friends, where > <stdlib.h> is the standard header. > > And since osdep.h already guarantees string.h and stdlib.h, we > can drop these unusual system header includes as redundant > rather than replacing them. > > Signed-off-by: Eric Blake <eblake@redhat.com> > --- > > Based-on: <20180207124009.12376-1-armbru@redhat.com> > ([PULL 00/20] Miscellaneous patches for 2018-02-07) > > target/i386/hax-windows.h | 2 -- > target/i386/hvf/x86_mmu.c | 1 - > 2 files changed, 3 deletions(-) Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/target/i386/hax-windows.h b/target/i386/hax-windows.h index 004f8676949..20e2f85407b 100644 --- a/target/i386/hax-windows.h +++ b/target/i386/hax-windows.h @@ -20,8 +20,6 @@ #ifndef TARGET_I386_HAX_WINDOWS_H #define TARGET_I386_HAX_WINDOWS_H -#include <memory.h> -#include <malloc.h> #include <winioctl.h> #include <windef.h> diff --git a/target/i386/hvf/x86_mmu.c b/target/i386/hvf/x86_mmu.c index c6be2cca357..d5a0efe7188 100644 --- a/target/i386/hvf/x86_mmu.c +++ b/target/i386/hvf/x86_mmu.c @@ -17,7 +17,6 @@ */ #include "qemu/osdep.h" -#include <memory.h> #include "panic.h" #include "qemu-common.h" #include "cpu.h"
<memory.h> is a non-standard obsolete header that was long ago replaced by <string.h>. <malloc.h> is a non-standard header; it is not obsolete (we must use it for malloc_trim, for example), but generally should not be used in files that just need malloc() and friends, where <stdlib.h> is the standard header. And since osdep.h already guarantees string.h and stdlib.h, we can drop these unusual system header includes as redundant rather than replacing them. Signed-off-by: Eric Blake <eblake@redhat.com> --- Based-on: <20180207124009.12376-1-armbru@redhat.com> ([PULL 00/20] Miscellaneous patches for 2018-02-07) target/i386/hax-windows.h | 2 -- target/i386/hvf/x86_mmu.c | 1 - 2 files changed, 3 deletions(-)