From 2efe201fa4082f0aad7360b9f6f21c7683a29e96 Mon Sep 17 00:00:00 2001 From: Herb Lewis Date: Thu, 14 Aug 2003 21:56:26 +0000 Subject: client/client.c - cannot initialize struct with non-const values include/byteorder.h - fix for IRIX compiler - cannot cast an LVALUE include/smb_interfaces.h - remove empty structure source/lib/debug.c - void functions cannot return value libcli/clifile.c - cannot assign *struct to struct (This used to be commit 9a724762012f55d21d44ea87add7daf21f7414d1) --- source4/include/byteorder.h | 2 +- source4/include/smb_interfaces.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'source4/include') diff --git a/source4/include/byteorder.h b/source4/include/byteorder.h index ed0eababdd..94a346f89d 100644 --- a/source4/include/byteorder.h +++ b/source4/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)) diff --git a/source4/include/smb_interfaces.h b/source4/include/smb_interfaces.h index 30e5efe97e..575590c364 100644 --- a/source4/include/smb_interfaces.h +++ b/source4/include/smb_interfaces.h @@ -1454,9 +1454,6 @@ union smb_lock { struct { enum lock_level level; - struct { - - } in; } generic; /* SMBlock interface */ -- cgit