diff options
author | Roman Bogorodskiy <bogorodskiy@gmail.com> | 2016-01-25 03:10:44 +0300 |
---|---|---|
committer | Daniel P. Berrange <berrange@redhat.com> | 2016-03-03 14:17:05 +0000 |
commit | f81f3570b3b38c9adf1e5e41d9b5be908b5fdf24 (patch) | |
tree | 28b0fa4ed73c3c01e7c4af4e7d0d81d3df3b1d9d /osinfo/osinfo_media.h | |
parent | 202acfef63226f72dcca843307ca773f72a46f6a (diff) | |
download | libosinfo-f81f3570b3b38c9adf1e5e41d9b5be908b5fdf24.tar.gz |
Fix build with older GCC
Build with older gcc fails with:
CC libosinfo_1_0_la-osinfo_avatar_format.lo
In file included from ../osinfo/osinfo_os.h:30,
from ../osinfo/osinfo.h:55,
from osinfo_avatar_format.c:28:
../osinfo/osinfo_media.h:68: error: redefinition of typedef 'OsinfoMedia'
../osinfo/osinfo_install_script.h:43: error: previous declaration of 'OsinfoMedia' was here
To avoid redefinition, use forward-declaration in a similar way
like it's done for OsinfoOs in osinfo/osinfo_os.h.
Diffstat (limited to 'osinfo/osinfo_media.h')
-rw-r--r-- | osinfo/osinfo_media.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/osinfo/osinfo_media.h b/osinfo/osinfo_media.h index 8ad39c4..09fbacd 100644 --- a/osinfo/osinfo_media.h +++ b/osinfo/osinfo_media.h @@ -65,8 +65,11 @@ typedef enum { #define OSINFO_IS_MEDIA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), OSINFO_TYPE_MEDIA)) #define OSINFO_MEDIA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), OSINFO_TYPE_MEDIA, OsinfoMediaClass)) -typedef struct _OsinfoMedia OsinfoMedia; - +/* + * Forward declared in osinfo_install_script.h + * + * typedef struct _OsinfoMedia OsinfoMedia; + */ typedef struct _OsinfoMediaClass OsinfoMediaClass; typedef struct _OsinfoMediaPrivate OsinfoMediaPrivate; |