diff options
| author | Jeremy Allison <jra@samba.org> | 2000-04-11 19:44:54 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2000-04-11 19:44:54 +0000 |
| commit | f6be38cae223f1ad3f4ecc5b81d14c44d92f58ba (patch) | |
| tree | fdfba0ada6fb79f89c27ace70eea7913e9d97915 /source3/include/byteorder.h | |
| parent | ca085145a9392c229b483ee24c1d566a23335fb3 (diff) | |
| download | samba-f6be38cae223f1ad3f4ecc5b81d14c44d92f58ba.tar.gz samba-f6be38cae223f1ad3f4ecc5b81d14c44d92f58ba.tar.bz2 samba-f6be38cae223f1ad3f4ecc5b81d14c44d92f58ba.zip | |
include/byteorder.h: ALIGN4/ALIGN2 macros.
include/includes.h: Added SMB_BIG_UINT_BITS.
lib/util.c: Removed align2/align4 - use macros.
libsmb/namequery.c: Use ALIGN2.
locking/locking.c: Replace do_lock, do_unlock, args with SMB_BIG_UINT, not SMB_OFF_T.
Needed to move to hiding POSIX locks at a lower layer.
nmbd/nmbd_processlogon.c: Use ALIGN2/ALIGN4 macros.
smbd/blocking.c: Replace do_lock, do_unlock, args with SMB_BIG_UINT, not SMB_OFF_T.
smbd/reply.c: Replace do_lock, do_unlock, args with SMB_BIG_UINT, not SMB_OFF_T.
Jeremy.
(This used to be commit 491eea8a20bf80d426625479326211dc975857a6)
Diffstat (limited to 'source3/include/byteorder.h')
| -rw-r--r-- | source3/include/byteorder.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/include/byteorder.h b/source3/include/byteorder.h index b376a8964c..f050e5d6cf 100644 --- a/source3/include/byteorder.h +++ b/source3/include/byteorder.h @@ -263,7 +263,7 @@ it also defines lots of intermediate macros, just ignore those :-) tab_depth(depth), base, string, outbuf)); } /* Alignment macros. */ -#define ALIGN4(p,base) ((4 - (PTR_DIFF((q), (base)) % 4)) & ~3) -#define ALIGN2(p,base) ((2 - (PTR_DIFF((q), (base)) % 2)) & ~1) +#define ALIGN4(p,base) ((p) + ((4 - (PTR_DIFF((p), (base)) % 4)) & ~3)) +#define ALIGN2(p,base) ((p) + ((2 - (PTR_DIFF((p), (base)) % 2)) & ~1)) #endif /* _BYTEORDER_H */ |