diff options
| author | Volker Lendecke <vl@samba.org> | 2011-08-30 17:02:54 +0200 |
|---|---|---|
| committer | Volker Lendecke <vlendec@samba.org> | 2011-08-30 19:16:14 +0200 |
| commit | e52fa6298a461bce125e4292c3c035a7bed22a51 (patch) | |
| tree | 4d80afcc75a1d991d37afc2a1fb71aeaf6bb35c7 | |
| parent | be44c45440c19c7f88b876478db24bced227ae36 (diff) | |
| download | samba-e52fa6298a461bce125e4292c3c035a7bed22a51.tar.gz samba-e52fa6298a461bce125e4292c3c035a7bed22a51.tar.bz2 samba-e52fa6298a461bce125e4292c3c035a7bed22a51.zip | |
s3: Silence some warnings
Rusty, please suggest a proper fix for this.
Thanks,
Volker Lendecke
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Tue Aug 30 19:16:14 CEST 2011 on sn-devel-104
| -rw-r--r-- | source3/lib/ctdbd_conn.c | 19 | ||||
| -rw-r--r-- | source3/lib/dbwrap/dbwrap_ctdb.c | 19 | ||||
| -rw-r--r-- | source3/lib/messages_ctdbd.c | 18 |
3 files changed, 56 insertions, 0 deletions
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c index 1b4f9ac68a..21a417c00d 100644 --- a/source3/lib/ctdbd_conn.c +++ b/source3/lib/ctdbd_conn.c @@ -27,7 +27,26 @@ #include "ctdb_packet.h" #include "messages.h" +/* + * It is not possible to include ctdb.h and tdb_compat.h (included via + * some other include above) without warnings. This fixes those + * warnings. + */ + +#ifdef typesafe_cb +#undef typesafe_cb +#endif + +#ifdef typesafe_cb_preargs +#undef typesafe_cb_preargs +#endif + +#ifdef typesafe_cb_postargs +#undef typesafe_cb_postargs +#endif + /* paths to these include files come from --with-ctdb= in configure */ + #include "ctdb.h" #include "ctdb_private.h" diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c index ada5cfce9f..3233253f7c 100644 --- a/source3/lib/dbwrap/dbwrap_ctdb.c +++ b/source3/lib/dbwrap/dbwrap_ctdb.c @@ -23,6 +23,25 @@ #include "lib/util/tdb_wrap.h" #include "util_tdb.h" #ifdef CLUSTER_SUPPORT + +/* + * It is not possible to include ctdb.h and tdb_compat.h (included via + * some other include above) without warnings. This fixes those + * warnings. + */ + +#ifdef typesafe_cb +#undef typesafe_cb +#endif + +#ifdef typesafe_cb_preargs +#undef typesafe_cb_preargs +#endif + +#ifdef typesafe_cb_postargs +#undef typesafe_cb_postargs +#endif + #include "ctdb.h" #include "ctdb_private.h" #include "ctdbd_conn.h" diff --git a/source3/lib/messages_ctdbd.c b/source3/lib/messages_ctdbd.c index 3140f65510..9e092bc699 100644 --- a/source3/lib/messages_ctdbd.c +++ b/source3/lib/messages_ctdbd.c @@ -23,6 +23,24 @@ #ifdef CLUSTER_SUPPORT +/* + * It is not possible to include ctdb.h and tdb_compat.h (included via + * some other include above) without warnings. This fixes those + * warnings. + */ + +#ifdef typesafe_cb +#undef typesafe_cb +#endif + +#ifdef typesafe_cb_preargs +#undef typesafe_cb_preargs +#endif + +#ifdef typesafe_cb_postargs +#undef typesafe_cb_postargs +#endif + #include "ctdb.h" #include "ctdb_private.h" #include "ctdbd_conn.h" |