GNOME Bugzilla – Bug 664455
Build fixes for GLib GIT master (2.31.x)
Last modified: 2011-11-23 00:27:07 UTC
Created attachment 201790 [details] [review] Fixes for #ifdefs in #define lines of gosccket i/o stream.c Hi, it seems that some recent changes caused build to break on Visual C++, so these are my proposed fixes for them, namely to cope with how preprocessors work with a #ifdef check within a #define line and where functions were placed in a source file as we are moving away from the use of gobjectnotifyqueue.c
Created attachment 201791 [details] [review] Move function definitions in gobject.c This is to move function declarations where they can be visible when G_ENABLE_DEBUG is not set. Thanks, and God bless!
Comment on attachment 201790 [details] [review] Fixes for #ifdefs in #define lines of gosccket i/o stream.c >- G_IMPLEMENT_INTERFACE (G_TYPE_POLLABLE_INPUT_STREAM, g_socket_input_stream_pollable_iface_init) >-#ifdef G_OS_UNIX >- >- G_IMPLEMENT_INTERFACE (G_TYPE_FILE_DESCRIPTOR_BASED, g_socket_input_stream_file_descriptor_based_iface_init) >-#endif >- ) >+ G_IMPLEMENT_INTERFACE (G_TYPE_POLLABLE_INPUT_STREAM, g_socket_input_stream_pollable_iface_init) >+ G_SOCKET_INPUT_STREAM_POLLABLE_IFACE_INIT you're implementing the pollable interface twice rather than implementing pollable once and GFileDescriptorBased once.
Created attachment 201824 [details] [review] Fixes for #ifdefs in #define lines of gosccket i/o stream.c (updated) Hi Dan, Sorry, must have copied/pasted stuff wrongly up there. Patch is updated here. Thanks, and God bless!
Comment on attachment 201824 [details] [review] Fixes for #ifdefs in #define lines of gosccket i/o stream.c (updated) I ended up fixing it slightly differently. leaving this bug open since I'm not sure about the gobject debug patch
I've fixed the gobject.c debug issue. Thanks for pointing that out !