From 96108eed100e1962c4abd75a021d84467ae4d690 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 28 Mar 2012 10:21:22 +1100 Subject: build: #ifdef LARGE_SMB_OFF_T as off_t is now always 64 bits --- source3/include/includes.h | 12 ------------ source3/include/smb.h | 4 ---- 2 files changed, 16 deletions(-) (limited to 'source3/include') diff --git a/source3/include/includes.h b/source3/include/includes.h index e321e4c943..ee7bb1cb7c 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -317,21 +317,9 @@ typedef uint64_t br_off; * NT SMB calls. */ -#ifndef LARGE_SMB_OFF_T -# if (defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T == 8)) -# define LARGE_SMB_OFF_T 1 -# endif -#endif - -#ifdef LARGE_SMB_OFF_T #define SOFF_T(p, ofs, v) (SIVAL(p,ofs,(v)&0xFFFFFFFF), SIVAL(p,(ofs)+4,(v)>>32)) #define SOFF_T_R(p, ofs, v) (SIVAL(p,(ofs)+4,(v)&0xFFFFFFFF), SIVAL(p,ofs,(v)>>32)) #define IVAL_TO_SMB_OFF_T(buf,off) ((SMB_OFF_T)(( ((uint64_t)(IVAL((buf),(off)))) & ((uint64_t)0xFFFFFFFF) ))) -#else -#define SOFF_T(p, ofs, v) (SIVAL(p,ofs,v),SIVAL(p,(ofs)+4,0)) -#define SOFF_T_R(p, ofs, v) (SIVAL(p,(ofs)+4,v),SIVAL(p,ofs,0)) -#define IVAL_TO_SMB_OFF_T(buf,off) ((SMB_OFF_T)(( ((uint32)(IVAL((buf),(off)))) & 0xFFFFFFFF ))) -#endif #ifndef HAVE_BLKSIZE_T /* This is mainly for HP/UX which defines st_blksize as long */ diff --git a/source3/include/smb.h b/source3/include/smb.h index 01253f0c54..ddf3227336 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -33,11 +33,7 @@ #define COPYRIGHT_STARTUP_MESSAGE "Copyright Andrew Tridgell and the Samba Team 1992-2012" -#if defined(LARGE_SMB_OFF_T) #define BUFFER_SIZE (128*1024) -#else /* no large readwrite possible */ -#define BUFFER_SIZE (0xFFFF) -#endif #define SAFETY_MARGIN 1024 #define LARGE_WRITEX_HDR_SIZE 65 -- cgit