diff options
author | Amitay Isaacs <amitay@gmail.com> | 2015-10-28 17:47:03 +1100 |
---|---|---|
committer | Martin Schwenke <martins@samba.org> | 2015-11-04 00:47:15 +0100 |
commit | d858c210a7d7498e539a9d76ece1a6b162e64c10 (patch) | |
tree | 07f896ec5cdaa915e02a589192c3b5f4497953a8 /ctdb/include/ctdb_client.h | |
parent | 22c84ff746eebb205d98014f5e4c3cf5b0438673 (diff) | |
download | samba-d858c210a7d7498e539a9d76ece1a6b162e64c10.tar.gz |
ctdb-daemon: Rename struct ctdb_server_id to ctdb_client_id
This is to avoid clash with samba structure server_id.
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'ctdb/include/ctdb_client.h')
-rw-r--r-- | ctdb/include/ctdb_client.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ctdb/include/ctdb_client.h b/ctdb/include/ctdb_client.h index 5e43347c712..d5ca55b3640 100644 --- a/ctdb/include/ctdb_client.h +++ b/ctdb/include/ctdb_client.h @@ -421,13 +421,13 @@ int ctdb_ctrl_get_tcp_tickles(struct ctdb_context *ctdb, int ctdb_ctrl_register_server_id(struct ctdb_context *ctdb, struct timeval timeout, - struct ctdb_server_id *id); + struct ctdb_client_id *id); int ctdb_ctrl_unregister_server_id(struct ctdb_context *ctdb, struct timeval timeout, - struct ctdb_server_id *id); + struct ctdb_client_id *id); int ctdb_ctrl_check_server_id(struct ctdb_context *ctdb, struct timeval timeout, uint32_t destnode, - struct ctdb_server_id *id, uint32_t *status); + struct ctdb_client_id *id, uint32_t *status); int ctdb_ctrl_get_server_id_list(struct ctdb_context *ctdb, TALLOC_CTX *mem_ctx, struct timeval timeout, uint32_t destnode, |