From ad04e5f5f9181516b7aee209237f20b9ca90da97 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 17 Jan 2019 11:03:14 +0100 Subject: [PATCH] lib:util: Move VWV macro to smb_constants.h Signed-off-by: Andreas Schneider Reviewed-by: Andrew Bartlett --- lib/util/byteorder.h | 3 --- libcli/smb/smb_constants.h | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/util/byteorder.h b/lib/util/byteorder.h index 3e991fbbb2f..d58e6d0b7d7 100644 --- a/lib/util/byteorder.h +++ b/lib/util/byteorder.h @@ -128,7 +128,4 @@ it also defines lots of intermediate macros, just ignore those :-) #define RSBVAL(buf,pos,val) SBVAL(buf,pos,BREV(val)) #define RSBVALS(buf,pos,val) SBVALS(buf,pos,BREV(val)) -/* macros for accessing SMB protocol elements */ -#define VWV(vwv) ((vwv)*2) - #endif /* _BYTEORDER_H */ diff --git a/libcli/smb/smb_constants.h b/libcli/smb/smb_constants.h index 47b5629743b..68476939a9a 100644 --- a/libcli/smb/smb_constants.h +++ b/libcli/smb/smb_constants.h @@ -59,6 +59,9 @@ #define HDR_WCT 32 #define HDR_VWV 33 +/* Macros for accessing SMB protocol elements */ +#define VWV(vwv) ((vwv)*2) + #define smb_len_nbt(buf) (RIVAL(buf, 0) & 0x1FFFF) #define _smb_setlen_nbt(buf,len) RSIVAL(buf, 0, (len) & 0x1FFFF) #define smb_setlen_nbt(buf, len) do { \ -- 2.47.3