diff mbox

[v6,01/26] qemu: add Error to typedefs

Message ID 1380452123-5989-2-git-send-email-mst@redhat.com
State New
Headers show

Commit Message

Michael S. Tsirkin Sept. 29, 2013, 10:58 a.m. UTC 
This is so qom headers can use it without pulling in
extra headers.

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 include/qemu/typedefs.h | 1 +
 1 file changed, 1 insertion(+)

Comments

Igor Mammedov Sept. 30, 2013, 1:10 p.m. UTC | #1 
On Sun, 29 Sep 2013 13:58:24 +0300
"Michael S. Tsirkin" <mst@redhat.com> wrote:

> This is so qom headers can use it without pulling in
> extra headers.
> 
> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
>  include/qemu/typedefs.h | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
> index a4c1b84..46c3599 100644
> --- a/include/qemu/typedefs.h
> +++ b/include/qemu/typedefs.h
> @@ -7,6 +7,7 @@ typedef struct QEMUTimer QEMUTimer;
>  typedef struct QEMUTimerListGroup QEMUTimerListGroup;
>  typedef struct QEMUFile QEMUFile;
>  typedef struct QEMUBH QEMUBH;
> +typedef struct Error Error;
>  
>  typedef struct AioContext AioContext;
>  

fc19 seems to ok with it but rhel6/gcc-4.4.7-4 isn't
./configure --enable-kvm --target-list=x86_64-softmmu,x86_64-linux-user

In file included from /qemu/include/qapi/visitor.h:18,
                 from qapi-visit.h:20,
                 from qapi-visit.c:18:
/qemu/include/qapi/error.h:23: error: redefinition of typedef ‘Error’
/qemu/include/qemu/typedefs.h:10: note: previous declaration of ‘Error’ was here
diff mbox

Patch

diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
index a4c1b84..46c3599 100644
--- a/include/qemu/typedefs.h
+++ b/include/qemu/typedefs.h
@@ -7,6 +7,7 @@  typedef struct QEMUTimer QEMUTimer;
 typedef struct QEMUTimerListGroup QEMUTimerListGroup;
 typedef struct QEMUFile QEMUFile;
 typedef struct QEMUBH QEMUBH;
+typedef struct Error Error;
 
 typedef struct AioContext AioContext;