X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Ftypes.h;h=027615e4f8ae02aaa72eda1cbe4f78caa932ddaf;hp=90f493963eb3aacabfe8f8ffff160722960fac11;hb=995326b6000773efd454e308d487dec0b9f564b5;hpb=ef139a3a5e41fbcbabdf4be0ecbbb5591448ad2e

diff --git a/src/helper/types.h b/src/helper/types.h
index 90f493963e..027615e4f8 100644
--- a/src/helper/types.h
+++ b/src/helper/types.h
@@ -19,8 +19,10 @@
  ***************************************************************************/
 #ifndef TYPES_H
 #define TYPES_H
-
+
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #ifndef u8
 typedef unsigned char u8;
@@ -34,25 +36,29 @@ typedef unsigned short u16;
 typedef unsigned int u32;
 #endif
 
+#ifndef u64
+typedef unsigned long long u64;
+#endif
+
 #ifdef WORDS_BIGENDIAN /* big endian host */
 
-#define le_to_h_u32(x) (u32)(x[0] | x[1] << 8 | x[2] << 16 | x[3] << 24)
-#define le_to_h_u16(x) (u16)(x[0] | x[1] << 8)
+#define le_to_h_u32(x) (u32)((x)[0] | (x)[1] << 8 | (x)[2] << 16 | (x)[3] << 24)
+#define le_to_h_u16(x) (u16)((x)[0] | (x)[1] << 8)
 #define be_to_h_u32(x) (*(u32*)(x))
 #define be_to_h_u16(x) (*(u16*)(x))
 
 #define h_u32_to_le(buf, val) \
 	do { \
-		buf[3] = (val & 0xff000000) >> 24; \
-		buf[2] = (val & 0x00ff0000) >> 16; \
-		buf[1] = (val & 0x0000ff00) >> 8; \
-		buf[0] = (val & 0x000000ff); \
+		(buf)[3] = ((val) & 0xff000000) >> 24; \
+		(buf)[2] = ((val) & 0x00ff0000) >> 16; \
+		(buf)[1] = ((val) & 0x0000ff00) >> 8; \
+		(buf)[0] = ((val) & 0x000000ff); \
 	} while (0)
 
 #define h_u16_to_le(buf, val)  \
 	do { \
-		buf[0] = (val & 0xff000) >> 8; \
-		buf[1] = (val & 0x00ff); \
+		(buf)[0] = ((val) & 0xff000) >> 8; \
+		(buf)[1] = ((val) & 0x00ff); \
 	} while (0)
 
 #define h_u32_to_be(buf, val) do { *(u32*)(buf) = (val); } while (0)
@@ -61,24 +67,24 @@ typedef unsigned int u32;
 #else /* little endian host */
 #define le_to_h_u32(x) (*(u32*)(x))
 #define le_to_h_u16(x) (*(u16*)(x))
-#define be_to_h_u32(x) (u32)(x[3] | x[2] << 8 | x[1] << 16 | x[0] << 24)
-#define be_to_h_u16(x) (u16)(x[1] | x[0] << 8)
+#define be_to_h_u32(x) (u32)((x)[3] | (x)[2] << 8 | (x)[1] << 16 | (x)[0] << 24)
+#define be_to_h_u16(x) (u16)((x)[1] | (x)[0] << 8)
 
 #define h_u32_to_le(buf, val) do { *(u32*)(buf) = (val); } while (0)
 #define h_u16_to_le(buf, val) do { *(u16*)(buf) = (val); } while (0)
 
 #define h_u32_to_be(buf, val) \
 	do { \
-		buf[0] = (val & 0xff000000) >> 24; \
-		buf[1] = (val & 0x00ff0000) >> 16; \
-		buf[2] = (val & 0x0000ff00) >> 8; \
-		buf[3] = (val & 0x000000ff); \
+		(buf)[0] = ((val) & 0xff000000) >> 24; \
+		(buf)[1] = ((val) & 0x00ff0000) >> 16; \
+		(buf)[2] = ((val) & 0x0000ff00) >> 8; \
+		(buf)[3] = ((val) & 0x000000ff); \
 	} while (0)
 
 #define h_u16_to_be(buf, val) \
 	do { \
-		buf[0] = (val & 0xff000) >> 8; \
-		buf[1] = (val & 0x00ff); \
+		(buf)[0] = ((val) & 0xff000) >> 8; \
+		(buf)[1] = ((val) & 0x00ff); \
 	} while (0)
 #endif