summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/locking.h2
-rw-r--r--source3/include/proto.h5
2 files changed, 1 insertions, 6 deletions
diff --git a/source3/include/locking.h b/source3/include/locking.h
index 77a04eee2b..b003b55aa4 100644
--- a/source3/include/locking.h
+++ b/source3/include/locking.h
@@ -45,7 +45,7 @@ struct lock_context {
struct files_struct;
-#include "../librpc/gen_ndr/file_id.h"
+#include "lib/file_id.h"
struct byte_range_lock {
struct files_struct *fsp;
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 14fe730b40..8392b68797 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -122,11 +122,6 @@ int map_errno_from_nt_status(NTSTATUS status);
/* The following definitions come from lib/file_id.c */
struct file_id vfs_file_id_from_sbuf(connection_struct *conn, const SMB_STRUCT_STAT *sbuf);
-bool file_id_equal(const struct file_id *id1, const struct file_id *id2);
-const char *file_id_string_tos(const struct file_id *id);
-void push_file_id_16(char *buf, const struct file_id *id);
-void push_file_id_24(char *buf, const struct file_id *id);
-void pull_file_id_24(char *buf, struct file_id *id);
/* The following definitions come from lib/gencache.c */