5 files changed, 13 insertions, 13 deletions
diff --git a/source4/include/MacExtensions.h b/source4/include/MacExtensions.h
index 92376b2cf0..150d207f88 100644
--- a/source4/include/MacExtensions.h
+++ b/source4/include/MacExtensions.h
@@ -57,9 +57,9 @@ typedef struct _AfpInfo
 	 uint32_t       	afpi_Version;     		/* Must be 0x00010000 */
 	 uint32_t       	afpi_Reserved1;
 	 uint32_t       	afpi_BackupTime;  		/* Backup time for the file/dir */
-	 unsigned char 	afpi_FinderInfo[AFP_FinderSize];  	/* Finder Info (32 bytes) */
-	 unsigned char 	afpi_ProDosInfo[6];  	/* ProDos Info (6 bytes) # */
-	 unsigned char 	afpi_Reserved2[6];
+	 uint8_t 	afpi_FinderInfo[AFP_FinderSize];  	/* Finder Info (32 bytes) */
+	 uint8_t 	afpi_ProDosInfo[6];  	/* ProDos Info (6 bytes) # */
+	 uint8_t 	afpi_Reserved2[6];
 } AfpInfo;
 
 typedef struct _SambaAfpInfo
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))
diff --git a/source4/include/md5.h b/source4/include/md5.h
index 6f8b7d0c15..57c2f99caa 100644
--- a/source4/include/md5.h
+++ b/source4/include/md5.h
@@ -8,13 +8,13 @@
 struct MD5Context {
 	uint32_t buf[4];
 	uint32_t bits[2];
-	unsigned char in[64];
+	uint8_t in[64];
 };
 
 void MD5Init(struct MD5Context *context);
-void MD5Update(struct MD5Context *context, unsigned char const *buf,
+void MD5Update(struct MD5Context *context, uint8_t const *buf,
 	       unsigned len);
-void MD5Final(unsigned char digest[16], struct MD5Context *context);
+void MD5Final(uint8_t digest[16], struct MD5Context *context);
 
 /*
  * This is needed to make RSAREF happy on some MS-DOS compilers.
diff --git a/source4/include/registry.h b/source4/include/registry.h
index 210bcd1ba3..478c7919ed 100644
--- a/source4/include/registry.h
+++ b/source4/include/registry.h
@@ -51,7 +51,7 @@ typedef struct reg_ops_s REG_OPS;
 #if 0
 //FIXME
 typedef struct ace_struct_s {
-  unsigned char type, flags;
+  uint8_t type, flags;
   unsigned int perms;   /* Perhaps a better def is in order */
   DOM_SID *trustee;
 } ACE;
diff --git a/source4/include/smb.h b/source4/include/smb.h
index c6866c52b4..178fab1db1 100644
--- a/source4/include/smb.h
+++ b/source4/include/smb.h
@@ -862,8 +862,8 @@ struct nmb_name {
 /* A netbios node status array element. */
 struct node_status {
 	char name[16];
-	unsigned char type;
-	unsigned char flags;
+	uint8_t type;
+	uint8_t flags;
 };
 
 #include "rpc_secdes.h"