summaryrefslogtreecommitdiff
path: root/drivers/staging/vt6655/tmacro.h
diff options
context:
space:
mode:
authorCharles Clément <caratorn@gmail.com>2010-06-24 11:02:26 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-06-24 14:23:17 -0700
commit2986db5fd31e312206d3ebfa4786aac04bdbe486 (patch)
tree910e5522ededbdce9e97601fccb79ae94ec51404 /drivers/staging/vt6655/tmacro.h
parent0f4c60d61e9c10a0733eacd650c101189bdf75cd (diff)
Staging: vt6655: remove WORD typedef
Replace all occurrences with unsigned short type. Signed-off-by: Charles Clément <caratorn@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vt6655/tmacro.h')
-rw-r--r--drivers/staging/vt6655/tmacro.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/vt6655/tmacro.h b/drivers/staging/vt6655/tmacro.h
index 99c86fef5e70..0c49430de8b6 100644
--- a/drivers/staging/vt6655/tmacro.h
+++ b/drivers/staging/vt6655/tmacro.h
@@ -37,24 +37,24 @@
#define LOBYTE(w) ((BYTE)(w))
#endif
#if !defined(HIBYTE)
-#define HIBYTE(w) ((BYTE)(((WORD)(w) >> 8) & 0xFF))
+#define HIBYTE(w) ((BYTE)(((unsigned short)(w) >> 8) & 0xFF))
#endif
#if !defined(LOWORD)
-#define LOWORD(d) ((WORD)(d))
+#define LOWORD(d) ((unsigned short)(d))
#endif
#if !defined(HIWORD)
-#define HIWORD(d) ((WORD)((((unsigned long)(d)) >> 16) & 0xFFFF))
+#define HIWORD(d) ((unsigned short)((((unsigned long)(d)) >> 16) & 0xFFFF))
#endif
#define LODWORD(q) ((q).u.dwLowDword)
#define HIDWORD(q) ((q).u.dwHighDword)
#if !defined(MAKEWORD)
-#define MAKEWORD(lb, hb) ((WORD)(((BYTE)(lb)) | (((WORD)((BYTE)(hb))) << 8)))
+#define MAKEWORD(lb, hb) ((unsigned short)(((BYTE)(lb)) | (((unsigned short)((BYTE)(hb))) << 8)))
#endif
#if !defined(MAKEDWORD)
-#define MAKEDWORD(lw, hw) ((unsigned long)(((WORD)(lw)) | (((unsigned long)((WORD)(hw))) << 16)))
+#define MAKEDWORD(lw, hw) ((unsigned long)(((unsigned short)(lw)) | (((unsigned long)((unsigned short)(hw))) << 16)))
#endif
#endif // __TMACRO_H__