diff options
| author | Gerald Carter <jerry@samba.org> | 2004-03-04 18:17:01 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2004-03-04 18:17:01 +0000 |
| commit | 7f6d708f8678e898bb58500d1bbc9c2473ee9b18 (patch) | |
| tree | 91289e734c1031c253c7e3f83c96e677f588d6cb | |
| parent | 51deca6bc9bbf6a07cbf5126cc6b2598484ef29c (diff) | |
| download | samba-7f6d708f8678e898bb58500d1bbc9c2473ee9b18.tar.gz samba-7f6d708f8678e898bb58500d1bbc9c2473ee9b18.tar.bz2 samba-7f6d708f8678e898bb58500d1bbc9c2473ee9b18.zip | |
BUG 1080: fix declaration of SMB_BIG_UINT
(This used to be commit 810bc1e2a02c6ab11ef00bf67b49929c596bee33)
| -rw-r--r-- | source3/include/includes.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 03b6b7165a..418eb2daa6 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -610,6 +610,18 @@ typedef int socklen_t; # endif #endif +#if defined(HAVE_LONGLONG) +#define SMB_BIG_UINT unsigned long long +#define SMB_BIG_INT long long +#define SBIG_UINT(p, ofs, v) (SIVAL(p,ofs,(v)&0xFFFFFFFF), SIVAL(p,(ofs)+4,(v)>>32)) +#else +#define SMB_BIG_UINT unsigned long +#define SMB_BIG_INT long +#define SBIG_UINT(p, ofs, v) (SIVAL(p,ofs,v),SIVAL(p,(ofs)+4,0)) +#endif + +#define SMB_BIG_UINT_BITS (sizeof(SMB_BIG_UINT)*8) + /* this should really be a 64 bit type if possible */ #define br_off SMB_BIG_UINT @@ -700,18 +712,6 @@ typedef int socklen_t; # endif #endif -#if defined(HAVE_LONGLONG) -#define SMB_BIG_UINT unsigned long long -#define SMB_BIG_INT long long -#define SBIG_UINT(p, ofs, v) (SIVAL(p,ofs,(v)&0xFFFFFFFF), SIVAL(p,(ofs)+4,(v)>>32)) -#else -#define SMB_BIG_UINT unsigned long -#define SMB_BIG_INT long -#define SBIG_UINT(p, ofs, v) (SIVAL(p,ofs,v),SIVAL(p,(ofs)+4,0)) -#endif - -#define SMB_BIG_UINT_BITS (sizeof(SMB_BIG_UINT)*8) - #ifndef MIN #define MIN(a,b) ((a)<(b)?(a):(b)) #endif |