summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2003-07-31 23:22:21 +0000
committerAndrew Tridgell <tridge@samba.org>2003-07-31 23:22:21 +0000
commitf1e71ed1b95e2d5904b93480f161cde838bc5ae0 (patch)
tree3a17491a74272b70a18ed16e2815fa8cc6dfb25c
parentd5c632cebb2e5ed640d237bd2b9bf20ff2e63e9f (diff)
downloadsamba-f1e71ed1b95e2d5904b93480f161cde838bc5ae0.tar.gz
samba-f1e71ed1b95e2d5904b93480f161cde838bc5ae0.tar.bz2
samba-f1e71ed1b95e2d5904b93480f161cde838bc5ae0.zip
CVAL_NC() doesn't need the (unsigned) fix and breaks the IRIX build
Thanks to Herb for pointing this out! (This used to be commit 87ede8d310db10d92b4ff57e67d3b53cbb7697fb)
-rw-r--r--source3/include/byteorder.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/include/byteorder.h b/source3/include/byteorder.h
index 63696fa858..0eef557306 100644
--- a/source3/include/byteorder.h
+++ b/source3/include/byteorder.h
@@ -106,7 +106,7 @@ it also defines lots of intermediate macros, just ignore those :-)
#endif
#define CVAL(buf,pos) ((unsigned)(((const unsigned char *)(buf))[pos]))
-#define CVAL_NC(buf,pos) ((unsigned)(((unsigned char *)(buf))[pos])) /* Non-const version of CVAL */
+#define CVAL_NC(buf,pos) (((unsigned char *)(buf))[pos]) /* Non-const version of CVAL */
#define PVAL(buf,pos) (CVAL(buf,pos))
#define SCVAL(buf,pos,val) (CVAL_NC(buf,pos) = (val))