[Spice-commits] gtk/channel-port.h

Christophe Fergau teuf at kemper.freedesktop.org
Tue Feb 17 02:52:57 PST 2015


 gtk/channel-port.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b6b78968b0488904af1b36fcfa8e864628daf45f
Author: Javier Celaya <javier.celaya at flexvm.es>
Date:   Wed Feb 11 15:34:13 2015 +0100

    channel-port: Remove dependency cycle
    
    channel-port.h includes spice-client.h, that includes channel-webdav.h,
    that includes channel-port.h again. It's enough if channel-port.h
    includes spice-channel.h
    
    Without this change, if one tries to build a source file which only
    includes spice-port.h, the build fails with:
    
    In file included from /usr/include/spice-client-glib-2.0/spice-client.h:46:0,
                     from /usr/include/spice-client-glib-2.0/channel-port.h:22,
                     from ./port.c:1:
    /usr/include/spice-client-glib-2.0/channel-webdav.h:44:5: error: unknown type name 'SpicePortChannel'
         SpicePortChannel parent;
         ^
    /usr/include/spice-client-glib-2.0/channel-webdav.h:58:5: error: unknown type name 'SpicePortChannelClass'
         SpicePortChannelClass parent_class;

diff --git a/gtk/channel-port.h b/gtk/channel-port.h
index 84d512d..08c15dc 100644
--- a/gtk/channel-port.h
+++ b/gtk/channel-port.h
@@ -19,7 +19,7 @@
 #define __SPICE_CLIENT_PORT_CHANNEL_H__
 
 #include <gio/gio.h>
-#include "spice-client.h"
+#include "spice-channel.h"
 
 G_BEGIN_DECLS
 


More information about the Spice-commits mailing list