diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-07-27 19:57:27 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-07-27 19:57:27 +0200 |
| commit | 72d2bea916c19405f4fa996b7f781d73e3ee87c8 (patch) | |
| tree | 3814912a6d73a09163152e56a0bc05288302dea2 /source4/lib/util/byteorder.h | |
| parent | 8d8ccc57e986d758a285a6af256ab945ccdac4dc (diff) | |
| parent | 55ea54ec640e4a76df397becc211a81aaec6f09d (diff) | |
| download | samba-72d2bea916c19405f4fa996b7f781d73e3ee87c8.tar.gz samba-72d2bea916c19405f4fa996b7f781d73e3ee87c8.tar.bz2 samba-72d2bea916c19405f4fa996b7f781d73e3ee87c8.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into manpage
(This used to be commit 7e90cc197c4fb2884f368cd72f391d0d8016fb96)
Diffstat (limited to 'source4/lib/util/byteorder.h')
| -rw-r--r-- | source4/lib/util/byteorder.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/lib/util/byteorder.h b/source4/lib/util/byteorder.h index 857bd1d50b..894beccabf 100644 --- a/source4/lib/util/byteorder.h +++ b/source4/lib/util/byteorder.h @@ -126,6 +126,8 @@ static __inline__ void st_le32(uint32_t *addr, const uint32_t val) __asm__ ("stwbrx %1,0,%2" : "=m" (*addr) : "r" (val), "r" (addr)); } #define HAVE_ASM_BYTEORDER 1 +#else +#define HAVE_ASM_BYTEORDER 0 #endif @@ -172,7 +174,7 @@ static __inline__ void st_le32(uint32_t *addr, const uint32_t val) #define SSVALS(buf,pos,val) SSVALX((buf),(pos),((int16_t)(val))) #define SIVALS(buf,pos,val) SIVALX((buf),(pos),((int32_t)(val))) -#else /* CAREFUL_ALIGNMENT */ +#else /* not CAREFUL_ALIGNMENT */ /* this handles things for architectures like the 386 that can handle alignment errors */ @@ -197,7 +199,7 @@ static __inline__ void st_le32(uint32_t *addr, const uint32_t val) #define SSVALS(buf,pos,val) SVALS_NC(buf,pos)=((int16_t)(val)) #define SIVALS(buf,pos,val) IVALS_NC(buf,pos)=((int32_t)(val)) -#endif /* CAREFUL_ALIGNMENT */ +#endif /* not CAREFUL_ALIGNMENT */ /* now the reverse routines - these are used in nmb packets (mostly) */ #define SREV(x) ((((x)&0xFF)<<8) | (((x)>>8)&0xFF)) |