diff options
| author | Andrew Tridgell <tridge@samba.org> | 2000-01-14 08:01:44 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2000-01-14 08:01:44 +0000 |
| commit | 7bc1cc7e07991641d436b2c8a35b52663d4c5c05 (patch) | |
| tree | 49b7da4ce534188c8a7c3ed36ff187434ae6eb5a /source3/include | |
| parent | 82af221e4a7e456f580f16bc5d2fd904fc018c96 (diff) | |
| download | samba-7bc1cc7e07991641d436b2c8a35b52663d4c5c05.tar.gz samba-7bc1cc7e07991641d436b2c8a35b52663d4c5c05.tar.bz2 samba-7bc1cc7e07991641d436b2c8a35b52663d4c5c05.zip | |
damn, Solaris already has a "enum lock_type"
changed it to "enum brl_type"
(This used to be commit 6b9ee7662c7afa70f6b20889e6b0ae1dcd677f9f)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/proto.h | 13 | ||||
| -rw-r--r-- | source3/include/smb.h | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 8618c1cd69..6829b89fe1 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -589,9 +589,8 @@ int cli_nt_create(struct cli_state *cli, char *fname); int cli_open(struct cli_state *cli, char *fname, int flags, int share_mode); BOOL cli_close(struct cli_state *cli, int fnum); BOOL cli_lock(struct cli_state *cli, int fnum, - uint32 offset, uint32 len, int timeout, enum lock_type lock_type); -BOOL cli_unlock(struct cli_state *cli, int fnum, - uint32 offset, uint32 len); + uint32 offset, uint32 len, int timeout, enum brl_type lock_type); +BOOL cli_unlock(struct cli_state *cli, int fnum, uint32 offset, uint32 len); size_t cli_read(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t size); ssize_t cli_write(struct cli_state *cli, int fnum, uint16 write_mode, @@ -758,14 +757,14 @@ void brl_init(void); BOOL brl_lock(SMB_DEV_T dev, SMB_INO_T ino, int fnum, uint16 smbpid, pid_t pid, uint16 tid, br_off start, br_off size, - enum lock_type lock_type); + enum brl_type lock_type); BOOL brl_unlock(SMB_DEV_T dev, SMB_INO_T ino, int fnum, uint16 smbpid, pid_t pid, uint16 tid, br_off start, br_off size); BOOL brl_locktest(SMB_DEV_T dev, SMB_INO_T ino, uint16 smbpid, pid_t pid, uint16 tid, br_off start, br_off size, - enum lock_type lock_type); + enum brl_type lock_type); void brl_close(SMB_DEV_T dev, SMB_INO_T ino, pid_t pid, int tid, int fnum); /*The following definitions come from locking/locking.c */ @@ -773,9 +772,9 @@ void brl_close(SMB_DEV_T dev, SMB_INO_T ino, pid_t pid, int tid, int fnum); void locking_close_file(files_struct *fsp); BOOL is_locked(files_struct *fsp,connection_struct *conn, SMB_OFF_T count,SMB_OFF_T offset, - enum lock_type lock_type); + enum brl_type lock_type); BOOL do_lock(files_struct *fsp,connection_struct *conn, - SMB_OFF_T count,SMB_OFF_T offset,enum lock_type lock_type, + SMB_OFF_T count,SMB_OFF_T offset,enum brl_type lock_type, int *eclass,uint32 *ecode); BOOL do_unlock(files_struct *fsp,connection_struct *conn, SMB_OFF_T count,SMB_OFF_T offset, diff --git a/source3/include/smb.h b/source3/include/smb.h index 2139a38fe5..4527ff9bff 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -906,7 +906,7 @@ typedef enum } parm_class; /* passed to br lock code */ -enum lock_type {READ_LOCK, WRITE_LOCK}; +enum brl_type {READ_LOCK, WRITE_LOCK}; struct enum_list { int value; |