diff options
author | Gerald W. Carter <jerry@samba.org> | 2008-04-17 18:11:22 +0200 |
---|---|---|
committer | Gerald W. Carter <jerry@samba.org> | 2008-04-17 18:11:22 +0200 |
commit | 5c29bc8931d025de4ec91247be04da4388642727 (patch) | |
tree | 0345ca3ba451dfdbe2f2bb48745299fe306e6d3f /source3/include/smb_macros.h | |
parent | 20104eef70ea1e2a64acb762ade2b4d64af0ee57 (diff) | |
parent | d4d706e0fa6ed2c6b8cd1d788257c7bd096a170b (diff) | |
download | samba-5c29bc8931d025de4ec91247be04da4388642727.tar.gz samba-5c29bc8931d025de4ec91247be04da4388642727.tar.bz2 samba-5c29bc8931d025de4ec91247be04da4388642727.zip |
Merge commit 'samba/v3-2-test' into wbc-test
(This used to be commit 7c2e735df3d8a4105a4944411d111fc66c13b01f)
Diffstat (limited to 'source3/include/smb_macros.h')
-rw-r--r-- | source3/include/smb_macros.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h index c98c4244de..0e21431226 100644 --- a/source3/include/smb_macros.h +++ b/source3/include/smb_macros.h @@ -169,8 +169,11 @@ #define reply_botherror(req,status,eclass,ecode) reply_both_error(req,eclass,ecode,status,__LINE__,__FILE__) #define reply_unixerror(req,defclass,deferror) reply_unix_error(req,defclass,deferror,NT_STATUS_OK,__LINE__,__FILE__) +#if 0 +/* defined in IDL */ /* these are the datagram types */ #define DGRAM_DIRECT_UNIQUE 0x10 +#endif #define SMB_ROUNDUP(x,r) ( ((x)%(r)) ? ( (((x)+(r))/(r))*(r) ) : (x)) |