diff options
| author | Stefan Metzmacher <metze@samba.org> | 2004-05-29 08:11:46 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:56:21 -0500 |
| commit | 45e93c19ef95978f908f5b14962770510634cd3b (patch) | |
| tree | 79e3dd4cb4154b6a90ceaa5fe8d56413a02ebf0e /source4/include/byteorder.h | |
| parent | d9538e7412c593a9dc10a600676939d2cf0205ea (diff) | |
| download | samba-45e93c19ef95978f908f5b14962770510634cd3b.tar.gz samba-45e93c19ef95978f908f5b14962770510634cd3b.tar.bz2 samba-45e93c19ef95978f908f5b14962770510634cd3b.zip | |
r943: change samba4 to use 'uint8_t' instead of 'unsigned char'
metze
(This used to be commit b5378803fdcb3b3afe7c2932a38828e83470f61a)
Diffstat (limited to 'source4/include/byteorder.h')
| -rw-r--r-- | source4/include/byteorder.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/include/byteorder.h b/source4/include/byteorder.h index e237b5d762..b3caa310a4 100644 --- a/source4/include/byteorder.h +++ b/source4/include/byteorder.h @@ -54,7 +54,7 @@ that don't have any int types that are 2 bytes long) You do this: -#define CVAL(buf,pos) (((unsigned char *)(buf))[pos]) +#define CVAL(buf,pos) (((uint8_t *)(buf))[pos]) #define PVAL(buf,pos) ((unsigned)CVAL(buf,pos)) #define SVAL(buf,pos) (PVAL(buf,pos)|PVAL(buf,(pos)+1)<<8) @@ -105,8 +105,8 @@ it also defines lots of intermediate macros, just ignore those :-) #define CAREFUL_ALIGNMENT 1 #endif -#define CVAL(buf,pos) ((unsigned)(((const unsigned char *)(buf))[pos])) -#define CVAL_NC(buf,pos) (((unsigned char *)(buf))[pos]) /* Non-const version of CVAL */ +#define CVAL(buf,pos) ((unsigned)(((const uint8_t *)(buf))[pos])) +#define CVAL_NC(buf,pos) (((uint8_t *)(buf))[pos]) /* Non-const version of CVAL */ #define PVAL(buf,pos) (CVAL(buf,pos)) #define SCVAL(buf,pos,val) (CVAL_NC(buf,pos) = (val)) @@ -115,7 +115,7 @@ it also defines lots of intermediate macros, just ignore those :-) #define SVAL(buf,pos) (PVAL(buf,pos)|PVAL(buf,(pos)+1)<<8) #define IVAL(buf,pos) (SVAL(buf,pos)|SVAL(buf,(pos)+2)<<16) -#define SSVALX(buf,pos,val) (CVAL_NC(buf,pos)=(unsigned char)((val)&0xFF),CVAL_NC(buf,pos+1)=(unsigned char)((val)>>8)) +#define SSVALX(buf,pos,val) (CVAL_NC(buf,pos)=(uint8_t)((val)&0xFF),CVAL_NC(buf,pos+1)=(uint8_t)((val)>>8)) #define SIVALX(buf,pos,val) (SSVALX(buf,pos,val&0xFFFF),SSVALX(buf,pos+2,val>>16)) #define SVALS(buf,pos) ((int16_t)SVAL(buf,pos)) #define IVALS(buf,pos) ((int32_t)IVAL(buf,pos)) |