[Pacemaker] Current Pacemaker from Git does not compile

[Andrew Beekhof]

Perfect!
Thanks for taking the time to work that one out :)

On Thursday, February 7, 2013, Vladislav Bogdanov wrote:

> 06.02.2013 00:47, Andrew Beekhof wrote:
> [...]
> > I thought it was supposed to be legal to do this, its not like the
> definitions are different :-/
> > Grumble.
>
> Following fixes this issue for me on EL6.
>
> diff --git a/include/crm/common/ipcs.h b/include/crm/common/ipcs.h
> index 5202bbc..b7991ae 100644
> --- a/include/crm/common/ipcs.h
> +++ b/include/crm/common/ipcs.h
> @@ -27,7 +27,8 @@
>  #    include <gnutls/gnutls.h>
>  #  endif
>
> -typedef struct mainloop_io_s mainloop_io_t;
> +#include <crm/common/mainloop.h>
> +
>  typedef struct crm_client_s crm_client_t;
>
>  enum client_type
> diff --git a/include/crm/common/mainloop.h b/include/crm/common/mainloop.h
> index 6bba0ac..eca3080 100644
> --- a/include/crm/common/mainloop.h
> +++ b/include/crm/common/mainloop.h
> @@ -43,6 +43,8 @@ gboolean mainloop_add_signal(int sig, void (*dispatch)
> (int sig));
>
>  gboolean mainloop_destroy_signal(int sig);
>
> +typedef struct mainloop_io_s mainloop_io_t;
> +
>  #include <crm/common/ipc.h>
>  #include <crm/common/ipcs.h>
>
> @@ -57,7 +59,6 @@ qb_ipcs_service_t *mainloop_add_ipc_server(
>
>  void mainloop_del_ipc_server(qb_ipcs_service_t *server);
>
> -typedef struct mainloop_io_s mainloop_io_t;
>
>  mainloop_io_t *mainloop_add_ipc_client(
>      const char *name, int priority, size_t max_size, void *userdata,
> struct ipc_client_callbacks *callbacks);
>
>
> _______________________________________________
> Pacemaker mailing list: Pacemaker at oss.clusterlabs.org <javascript:;>
> http://oss.clusterlabs.org/mailman/listinfo/pacemaker
>
> Project Home: http://www.clusterlabs.org
> Getting started: http://www.clusterlabs.org/doc/Cluster_from_Scratch.pdf
> Bugs: http://bugs.clusterlabs.org
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.clusterlabs.org/pipermail/pacemaker/attachments/20130208/27731d90/attachment.htm>