diff options
| author | Frediano Ziglio <fziglio@redhat.com> | 2016-10-20 13:00:25 +0100 |
|---|---|---|
| committer | Frediano Ziglio <fziglio@redhat.com> | 2016-10-20 17:01:19 +0100 |
| commit | 177c331c53874109c404a4aa65e83aa595188bb2 (patch) | |
| tree | e1f75f2b665e6c82cda3fb78fdad0b493fa59e96 | |
| parent | beec1b4175b24d71a0a39482661926a8c76114b5 (diff) | |
Avoid to typedef twice MainChannel
MainChannel is already defined in main-channel.h.
Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
| -rw-r--r-- | server/main-channel-client.h | 4 | ||||
| -rw-r--r-- | server/main-channel.h | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/server/main-channel-client.h b/server/main-channel-client.h index 360c61e9..14fb419a 100644 --- a/server/main-channel-client.h +++ b/server/main-channel-client.h @@ -21,12 +21,10 @@ #include <common/messages.h> #include "red-channel-client.h" +#include "main-channel.h" G_BEGIN_DECLS -/* FIXME: remove extra MainChannel typedef when possible */ -typedef struct MainChannel MainChannel; - #define TYPE_MAIN_CHANNEL_CLIENT main_channel_client_get_type() #define MAIN_CHANNEL_CLIENT(obj) \ diff --git a/server/main-channel.h b/server/main-channel.h index 73c8a94d..6e89f14a 100644 --- a/server/main-channel.h +++ b/server/main-channel.h @@ -23,7 +23,6 @@ #include <common/marshaller.h> #include "red-channel.h" -#include "main-channel-client.h" #define MAIN_CHANNEL(channel) ((MainChannel*)(channel)) |