diff options
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/g_lock.h | 2 | ||||
| -rw-r--r-- | source3/include/messages.h | 4 | ||||
| -rw-r--r-- | source3/include/proto.h | 1 |
3 files changed, 2 insertions, 5 deletions
diff --git a/source3/include/g_lock.h b/source3/include/g_lock.h index fc9a8721de..f4b7809475 100644 --- a/source3/include/g_lock.h +++ b/source3/include/g_lock.h @@ -44,7 +44,7 @@ NTSTATUS g_lock_get(struct g_lock_ctx *ctx, const char *name, struct server_id *pid); NTSTATUS g_lock_do(const char *name, enum g_lock_type lock_type, - struct timeval timeout, struct server_id self, + struct timeval timeout, void (*fn)(void *private_data), void *private_data); int g_lock_locks(struct g_lock_ctx *ctx, diff --git a/source3/include/messages.h b/source3/include/messages.h index 083cd56256..e3538f1765 100644 --- a/source3/include/messages.h +++ b/source3/include/messages.h @@ -109,7 +109,6 @@ bool message_send_all(struct messaging_context *msg_ctx, int *n_sent); struct event_context *messaging_event_context(struct messaging_context *msg_ctx); struct messaging_context *messaging_init(TALLOC_CTX *mem_ctx, - struct server_id server_id, struct event_context *ev); struct server_id messaging_server_id(const struct messaging_context *msg_ctx); @@ -117,8 +116,7 @@ struct server_id messaging_server_id(const struct messaging_context *msg_ctx); /* * re-init after a fork */ -NTSTATUS messaging_reinit(struct messaging_context *msg_ctx, - struct server_id id); +NTSTATUS messaging_reinit(struct messaging_context *msg_ctx); NTSTATUS messaging_register(struct messaging_context *msg_ctx, void *private_data, diff --git a/source3/include/proto.h b/source3/include/proto.h index 2d61ef4a4e..15cd7f9be0 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -497,7 +497,6 @@ ssize_t write_data_at_offset(int fd, const char *buffer, size_t N, SMB_OFF_T pos int set_blocking(int fd, bool set); NTSTATUS reinit_after_fork(struct messaging_context *msg_ctx, struct event_context *ev_ctx, - struct server_id id, bool parent_longlived); void *malloc_(size_t size); void *memalign_array(size_t el_size, size_t align, unsigned int count); |