diff options
| author | Günther Deschner <gd@samba.org> | 2011-05-05 11:25:29 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-05-06 10:48:10 +0200 |
| commit | d8cfca3a9bd2b6b6c562fd202377d95a98eb5472 (patch) | |
| tree | 96fc9d454a01cbb2c26a8db22f41b8bf0dc40879 /source3/include | |
| parent | 8aae59a277fe4bf5a1a84cb4730e5772c9ffca8c (diff) | |
| download | samba-d8cfca3a9bd2b6b6c562fd202377d95a98eb5472.tar.gz samba-d8cfca3a9bd2b6b6c562fd202377d95a98eb5472.tar.bz2 samba-d8cfca3a9bd2b6b6c562fd202377d95a98eb5472.zip | |
s3: only include tdb headers where needed.
Guenther
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/ctdbd_conn.h | 2 | ||||
| -rw-r--r-- | source3/include/dbwrap.h | 2 | ||||
| -rw-r--r-- | source3/include/includes.h | 3 | ||||
| -rw-r--r-- | source3/include/printing.h | 7 |
4 files changed, 10 insertions, 4 deletions
diff --git a/source3/include/ctdbd_conn.h b/source3/include/ctdbd_conn.h index ef291fb4ad..36b6542da0 100644 --- a/source3/include/ctdbd_conn.h +++ b/source3/include/ctdbd_conn.h @@ -20,6 +20,8 @@ #ifndef _CTDBD_CONN_H #define _CTDBD_CONN_H +#include <tdb.h> + struct ctdbd_connection; struct messaging_context; struct messaging_rec; diff --git a/source3/include/dbwrap.h b/source3/include/dbwrap.h index ef35b0071d..d657ee7f30 100644 --- a/source3/include/dbwrap.h +++ b/source3/include/dbwrap.h @@ -20,6 +20,8 @@ #ifndef __DBWRAP_H__ #define __DBWRAP_H__ +#include <tdb.h> + struct db_record { TDB_DATA key, value; NTSTATUS (*store)(struct db_record *rec, TDB_DATA data, int flag); diff --git a/source3/include/includes.h b/source3/include/includes.h index 59aa45afd7..ddac6d02d1 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -510,8 +510,6 @@ typedef char fstring[FSTRING_LEN]; #include "../lib/util/attr.h" #include "../lib/util/tsort.h" #include "../lib/util/dlinklist.h" -#include <tdb.h> -#include "util_tdb.h" #include <talloc.h> @@ -522,6 +520,7 @@ typedef char fstring[FSTRING_LEN]; #include "../lib/util/debug.h" #include "../lib/util/debug_s3.h" +#include "../libcli/util/ntstatus.h" #include "libads/ads_status.h" #include "../libcli/util/error.h" #include "../lib/util/charset/charset.h" diff --git a/source3/include/printing.h b/source3/include/printing.h index 084c699c5b..bba7d53a16 100644 --- a/source3/include/printing.h +++ b/source3/include/printing.h @@ -158,9 +158,12 @@ extern struct printif iprint_printif; /* There can be this many printing tdb's open, plus any locked ones. */ #define MAX_PRINT_DBS_OPEN 1 +struct TDB_DATA; +struct tdb_context; + struct tdb_print_db { struct tdb_print_db *next, *prev; - TDB_CONTEXT *tdb; + struct tdb_context *tdb; int ref_count; fstring printer_name; }; @@ -249,7 +252,7 @@ uint32_t print_parse_jobid(const char *fname); struct tdb_print_db *get_print_db_byname(const char *printername); void release_print_db( struct tdb_print_db *pdb); void close_all_print_db(void); -TDB_DATA get_printer_notify_pid_list(TDB_CONTEXT *tdb, const char *printer_name, bool cleanlist); +struct TDB_DATA get_printer_notify_pid_list(struct tdb_context *tdb, const char *printer_name, bool cleanlist); void print_queue_receive(struct messaging_context *msg, void *private_data, |