| Message ID | 20230119065959.3104012-10-armbru@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Clean up includes | expand |
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com> On Thu, Jan 19, 2023 at 9:00 AM Markus Armbruster <armbru@redhat.com> wrote: > Clean up includes so that osdep.h is included first and headers > which it implies are not included manually. > > This commit was created with scripts/clean-includes. > > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > qga/cutils.h | 2 -- > qga/commands-posix.c | 1 - > qga/cutils.c | 3 ++- > 3 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/qga/cutils.h b/qga/cutils.h > index f0f30a7d28..c1f2f4b17a 100644 > --- a/qga/cutils.h > +++ b/qga/cutils.h > @@ -1,8 +1,6 @@ > #ifndef CUTILS_H_ > #define CUTILS_H_ > > -#include "qemu/osdep.h" > - > int qga_open_cloexec(const char *name, int flags, mode_t mode); > > #endif /* CUTILS_H_ */ > diff --git a/qga/commands-posix.c b/qga/commands-posix.c > index ebd33a643c..079689d79a 100644 > --- a/qga/commands-posix.c > +++ b/qga/commands-posix.c > @@ -51,7 +51,6 @@ > #else > #include <net/ethernet.h> > #endif > -#include <sys/types.h> > #ifdef CONFIG_SOLARIS > #include <sys/sockio.h> > #endif > diff --git a/qga/cutils.c b/qga/cutils.c > index b8e142ef64..b21bcf3683 100644 > --- a/qga/cutils.c > +++ b/qga/cutils.c > @@ -2,8 +2,9 @@ > * This work is licensed under the terms of the GNU GPL, version 2 or > later. > * See the COPYING file in the top-level directory. > */ > -#include "cutils.h" > > +#include "qemu/osdep.h" > +#include "cutils.h" > #include "qapi/error.h" > > /** > -- > 2.39.0 > >
diff --git a/qga/cutils.h b/qga/cutils.h index f0f30a7d28..c1f2f4b17a 100644 --- a/qga/cutils.h +++ b/qga/cutils.h @@ -1,8 +1,6 @@ #ifndef CUTILS_H_ #define CUTILS_H_ -#include "qemu/osdep.h" - int qga_open_cloexec(const char *name, int flags, mode_t mode); #endif /* CUTILS_H_ */ diff --git a/qga/commands-posix.c b/qga/commands-posix.c index ebd33a643c..079689d79a 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -51,7 +51,6 @@ #else #include <net/ethernet.h> #endif -#include <sys/types.h> #ifdef CONFIG_SOLARIS #include <sys/sockio.h> #endif diff --git a/qga/cutils.c b/qga/cutils.c index b8e142ef64..b21bcf3683 100644 --- a/qga/cutils.c +++ b/qga/cutils.c @@ -2,8 +2,9 @@ * This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ -#include "cutils.h" +#include "qemu/osdep.h" +#include "cutils.h" #include "qapi/error.h" /**
Clean up includes so that osdep.h is included first and headers which it implies are not included manually. This commit was created with scripts/clean-includes. Signed-off-by: Markus Armbruster <armbru@redhat.com> --- qga/cutils.h | 2 -- qga/commands-posix.c | 1 - qga/cutils.c | 3 ++- 3 files changed, 2 insertions(+), 4 deletions(-)