diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-21 14:51:13 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-21 14:51:13 +0200 |
| commit | 5209a846a9157e649fcdcb561f7eaf19c8c0e465 (patch) | |
| tree | b0a7e52b5646c8eec182dbc391e7934b6804488c /source3/include/client.h | |
| parent | 625359b2e266105022309df8985720108ecd6f67 (diff) | |
| parent | 2ee8d29d22bcb1c350ab59d71b0aee548489bc9c (diff) | |
| download | samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.tar.gz samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.tar.bz2 samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv
Conflicts:
source4/lib/registry/ldb.c
source4/rpc_server/winreg/rpc_winreg.c
Diffstat (limited to 'source3/include/client.h')
| -rw-r--r-- | source3/include/client.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/include/client.h b/source3/include/client.h index 70b0421c6d..8d57fe1eed 100644 --- a/source3/include/client.h +++ b/source3/include/client.h @@ -232,7 +232,7 @@ struct cli_state { typedef struct file_info { struct cli_state *cli; - SMB_BIG_UINT size; + uint64_t size; uint16 mode; uid_t uid; gid_t gid; |