lib:util: Move VWV macro to smb_constants.h

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/lib/util/byteorder.h b/lib/util/byteorder.h
index 3e991fbbb2fcead01b99ee1d4c28767cc137d956..d58e6d0b7d7c730a4ddd29db6053d7f9316361d5 100644 (file)
--- 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 47b5629743b6f719aa9d6072052fd9a2e574e98b..68476939a9a72d60626c094dafab567c6cdc97c8 100644 (file)
--- 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 { \