diff options
| author | Gerald Carter <jerry@samba.org> | 2004-03-04 18:17:54 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2004-03-04 18:17:54 +0000 |
| commit | 20729772874ebdecbac5810a795200acf912ecf6 (patch) | |
| tree | 38ef1ed475bac4f9670d6fe4f584c1d0ddc61f1e | |
| parent | 381485668af40f83f17139c9f79772480cd62580 (diff) | |
| download | samba-20729772874ebdecbac5810a795200acf912ecf6.tar.gz samba-20729772874ebdecbac5810a795200acf912ecf6.tar.bz2 samba-20729772874ebdecbac5810a795200acf912ecf6.zip | |
BUG 1080: fix declaration of SMB_BIG_UINT
(This used to be commit 0b17a4105ecbad26b6bb79ed8148495c02518430)
| -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 01822d7c00..3ae5d0b201 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 |