summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Hards <bradh@frogmouth.net>2008-07-25 17:43:21 +1000
committerAndrew Bartlett <abartlet@samba.org>2008-07-25 17:43:21 +1000
commita05c9ab9391c80da747e2ee8cd52e92c23f5c72d (patch)
treefb90b5e9c779d4a4779b7c9c7aabc4ee5edc2e77
parentc09fa19d133e50aca085a7c51f09b4b2e216684e (diff)
downloadsamba-a05c9ab9391c80da747e2ee8cd52e92c23f5c72d.tar.gz
samba-a05c9ab9391c80da747e2ee8cd52e92c23f5c72d.tar.bz2
samba-a05c9ab9391c80da747e2ee8cd52e92c23f5c72d.zip
Define HAVE_ASM_BYTEORDER at all times
(This used to be commit 396ea14732d667960091f4a2570341059914ecb6)
-rw-r--r--source4/lib/util/byteorder.h6
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))