diff options
| author | Stefan Metzmacher <metze@samba.org> | 2005-11-11 10:46:31 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:46:11 -0500 |
| commit | 7935df168f4e98e5d3da352ea555883b0be8bbd3 (patch) | |
| tree | 13fad4bca8d3e2fd9de9e312a115469b1544c369 | |
| parent | 3e54c36fa459ec6f5e721b90ce4e4c1d0e31d85c (diff) | |
| download | samba-7935df168f4e98e5d3da352ea555883b0be8bbd3.tar.gz samba-7935df168f4e98e5d3da352ea555883b0be8bbd3.tar.bz2 samba-7935df168f4e98e5d3da352ea555883b0be8bbd3.zip | |
r11675: a more general way of getting rid of compiler warnings and errors
metze
(This used to be commit 653f5ccd61f2555bbd49b81c5cc660962b31aa68)
| -rw-r--r-- | source4/include/byteorder.h | 2 | ||||
| -rw-r--r-- | source4/libcli/smb2/request.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/include/byteorder.h b/source4/include/byteorder.h index d0402d0dcc..941dee9e88 100644 --- a/source4/include/byteorder.h +++ b/source4/include/byteorder.h @@ -218,7 +218,7 @@ static __inline__ void st_le32(uint32_t *addr, const uint32_t val) #define VWV(vwv) ((vwv)*2) /* 64 bit macros */ -#define SBVAL(p, ofs, v) (SIVAL(p,ofs,(v)&0xFFFFFFFF), SIVAL(p,(ofs)+4,(v)>>32)) +#define SBVAL(p, ofs, v) (SIVAL(p,ofs,(v)&0xFFFFFFFF), SIVAL(p,(ofs)+4,((uint64_t)(v))>>32)) #define BVAL(p, ofs) (IVAL(p,ofs) | (((uint64_t)IVAL(p,(ofs)+4)) << 32)) #endif /* _BYTEORDER_H */ diff --git a/source4/libcli/smb2/request.c b/source4/libcli/smb2/request.c index deadd1794f..7e25de99a8 100644 --- a/source4/libcli/smb2/request.c +++ b/source4/libcli/smb2/request.c @@ -70,7 +70,7 @@ struct smb2_request *smb2_request_init(struct smb2_transport *transport, SBVAL(req->out.hdr, SMB2_HDR_SEQNUM, req->seqnum); SIVAL(req->out.hdr, SMB2_HDR_PID, 0); SIVAL(req->out.hdr, SMB2_HDR_TID, 0); - SBVAL(req->out.hdr, SMB2_HDR_UID, (uint64_t)0); + SBVAL(req->out.hdr, SMB2_HDR_UID, 0); memset(req->out.hdr+SMB2_HDR_SIG, 0, 16); return req; |