r5296: - only include the tdb headers where they are needed

[samba.git] / source4 / ntvfs / common / brlock.c

diff --git a/source4/ntvfs/common/brlock.c b/source4/ntvfs/common/brlock.c
index f51e3d0694a026878e773d8bdc085299d0759263..e88e9638a3fc616c060b1ef257c5a2e5a6ea4493 100644 (file)
--- a/source4/ntvfs/common/brlock.c
+++ b/source4/ntvfs/common/brlock.c
@@ -26,6 +26,7 @@
    used. This allows us to provide the same semantics as NT */
 
 #include "includes.h"
+#include "lib/tdb/include/tdb.h"
 #include "messages.h"
 
 /*
@@ -41,7 +42,7 @@
   lock is the same as another lock
 */
 struct lock_context {
-       servid_t server;
+       uint32_t server;
        uint16_t smbpid;
        uint16_t tid;
 };
@@ -60,7 +61,7 @@ struct lock_struct {
 
 struct brl_context {
        struct tdb_wrap *w;
-       servid_t server;
+       uint32_t server;
        uint16_t tid;
        struct messaging_context *messaging_ctx;
        struct lock_struct last_lock;
@@ -72,7 +73,7 @@ struct brl_context {
   talloc_free(). We need the messaging_ctx to allow for
   pending lock notifications.
 */
-struct brl_context *brl_init(TALLOC_CTX *mem_ctx, servid_t server, uint16_t tid, 
+struct brl_context *brl_init(TALLOC_CTX *mem_ctx, uint32_t server, uint16_t tid, 
                             struct messaging_context *messaging_ctx)
 {
        char *path;
@@ -525,7 +526,7 @@ NTSTATUS brl_remove_pending(struct brl_context *brl,
 NTSTATUS brl_locktest(struct brl_context *brl,
                      DATA_BLOB *file_key, 
                      uint16_t fnum,
-                     uint16 smbpid, 
+                     uint16_t smbpid, 
                      uint64_t start, uint64_t size, 
                      enum brl_type lock_type)
 {