diff options
| author | Volker Lendecke <vl@samba.org> | 2015-03-12 14:40:16 +0000 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2015-03-17 11:30:52 +0100 |
| commit | de811f14af2083febdea5a1310f78407115168f6 (patch) | |
| tree | 833a9340df711f33520b19fad5d38a8db832d4b6 /source3/lib | |
| parent | cf368cbdc5f1b6ee1f831e3a90d8d77ef8d317ed (diff) | |
| download | samba-de811f14af2083febdea5a1310f78407115168f6.tar.gz | |
lib: Remove tdb_compat
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/ctdbd_conn.c | 18 | ||||
| -rw-r--r-- | source3/lib/dbwrap/dbwrap_ctdb.c | 18 | ||||
| -rw-r--r-- | source3/lib/eventlog/eventlog.h | 2 | ||||
| -rw-r--r-- | source3/lib/messages_ctdbd.c | 18 | ||||
| -rw-r--r-- | source3/lib/tdb_validate.h | 2 |
5 files changed, 2 insertions, 56 deletions
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c index 18b877c2353..85717dd0dcc 100644 --- a/source3/lib/ctdbd_conn.c +++ b/source3/lib/ctdbd_conn.c @@ -27,24 +27,6 @@ #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" diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c index 947a888982d..f37bfd82596 100644 --- a/source3/lib/dbwrap/dbwrap_ctdb.c +++ b/source3/lib/dbwrap/dbwrap_ctdb.c @@ -27,24 +27,6 @@ #include "dbwrap/dbwrap_rbt.h" #include "lib/param/param.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 - #include "ctdb.h" #include "ctdb_private.h" #include "ctdbd_conn.h" diff --git a/source3/lib/eventlog/eventlog.h b/source3/lib/eventlog/eventlog.h index 694732d184a..b485bfe08e9 100644 --- a/source3/lib/eventlog/eventlog.h +++ b/source3/lib/eventlog/eventlog.h @@ -17,7 +17,7 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "tdb_compat.h" +#include <tdb.h> /* Defines for TDB keys */ #define EVT_OLDEST_ENTRY "INFO/oldest_entry" diff --git a/source3/lib/messages_ctdbd.c b/source3/lib/messages_ctdbd.c index 1268bd4a506..799780e6a14 100644 --- a/source3/lib/messages_ctdbd.c +++ b/source3/lib/messages_ctdbd.c @@ -22,24 +22,6 @@ #include "util_tdb.h" #include "lib/util/iov_buf.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 - #include "ctdb.h" #include "ctdb_private.h" #include "ctdbd_conn.h" diff --git a/source3/lib/tdb_validate.h b/source3/lib/tdb_validate.h index 5bb043d2924..3e7c20d04cf 100644 --- a/source3/lib/tdb_validate.h +++ b/source3/lib/tdb_validate.h @@ -23,7 +23,7 @@ #define __TDB_VALIDATE_H__ #include "lib/replace/replace.h" -#include "tdb_compat.h" +#include <tdb.h> /** * Flag field for keeping track of the status of a validation. |