"Daniel P. Berrange" <berrange(a)redhat.com> wrote:
On Tue, Oct 28, 2008 at 12:21:31PM +0100, Jim Meyering wrote:
> From: Jim Meyering <meyering(a)redhat.com>
>
> ---
> qemud/remote_protocol.c | 3 +++
> qemud/remote_protocol.h | 2 ++
> 2 files changed, 5 insertions(+), 0 deletions(-)
>
> diff --git a/qemud/remote_protocol.c b/qemud/remote_protocol.c
> index 06b33d8..652d5b5 100644
> --- a/qemud/remote_protocol.c
> +++ b/qemud/remote_protocol.c
> @@ -3,9 +3,12 @@
> * It was generated using rpcgen.
> */
>
> +#include "remote_protocol.h"
> #include <config.h>
> #include "internal.h"
> #include "socketcompat.h"
> +#include "remote_protocol.h"
> +#include <rpc/xdr.h>
This doesn't look right having the same file included twice.
Sure doesn't ;-)
> bool_t
> xdr_remote_nonnull_string (XDR *xdrs, remote_nonnull_string *objp)
> diff --git a/qemud/remote_protocol.h b/qemud/remote_protocol.h
> index e43514d..bfcf40b 100644
> --- a/qemud/remote_protocol.h
> +++ b/qemud/remote_protocol.h
> @@ -16,6 +16,8 @@ extern "C" {
> #include <config.h>
> #include "internal.h"
> #include "socketcompat.h"
> +#include "remote_protocol.h"
> +#include <rpc/xdr.h>
And including itself here.
Ditto.
I've removed that change from the series, regenerated,
and see that neither mingw nor linux builds have problems
or additional warnings.
So that means I'm removing these 3 change sets from this series.
Thanks!