summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-02-25 02:22:44 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:55:47 -0500
commitf95e9fc45b1d34c55b04318b79928adabd8f09e2 (patch)
tree1eb89006e7cd1e686851f86dc17b10aa13bc2f8d /source3/include
parent4ef6976c58a0ca895fb23c490b1f8c55def83923 (diff)
downloadsamba-f95e9fc45b1d34c55b04318b79928adabd8f09e2.tar.gz
samba-f95e9fc45b1d34c55b04318b79928adabd8f09e2.tar.bz2
samba-f95e9fc45b1d34c55b04318b79928adabd8f09e2.zip
r5548: Stop lying about allocation sizes to Windows clients. It was a nice
idea, and aparently improved performance in some circumstances, but it breaks the VC++ compiler :-(. Not cool. Fix bug #2146. Jeremy. (This used to be commit b9f147634df0126320ffe3b9a23068e76f6c1681)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/local.h3
-rw-r--r--source3/include/smb_macros.h2
2 files changed, 0 insertions, 5 deletions
diff --git a/source3/include/local.h b/source3/include/local.h
index 7ac2e25612..7d5baa21fa 100644
--- a/source3/include/local.h
+++ b/source3/include/local.h
@@ -198,9 +198,6 @@
/* the maximum age in seconds of a password. Should be a lp_ parameter */
#define MAX_PASSWORD_AGE (21*24*60*60)
-/* Allocation roundup. */
-#define SMB_ROUNDUP_ALLOCATION_SIZE 0x100000
-
/* shall we deny oplocks to clients that get timeouts? */
#define FASCIST_OPLOCK_BACKOFF 1
diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h
index 4fa9ffa5ac..b1ac617f5c 100644
--- a/source3/include/smb_macros.h
+++ b/source3/include/smb_macros.h
@@ -178,8 +178,6 @@
/* this is how errors are generated */
#define UNIXERROR(defclass,deferror) unix_error_packet(outbuf,defclass,deferror,__LINE__,__FILE__)
-#define SMB_ROUNDUP(x,r) ( ((x)%(r)) ? ( (((x)+(r))/(r))*(r) ) : (x))
-
/* Extra macros added by Ying Chen at IBM - speed increase by inlining. */
#define smb_buf(buf) (((char *)(buf)) + smb_size + CVAL(buf,smb_wct)*2)
#define smb_buflen(buf) (SVAL(buf,smb_vwv0 + (int)CVAL(buf, smb_wct)*2))