Use typedef instead of #define to define MS-Windows types. Add a few more

pointer types.

diff --git a/comedi/drivers/addi-data/addi_common.h b/comedi/drivers/addi-data/addi_common.h
index 70b4fd633bce87759e8e4e2b5cd7f112237c36aa..e7ccf84684e5079193aad88a35f531bedfa09544 100644 (file)
--- a/comedi/drivers/addi-data/addi_common.h
+++ b/comedi/drivers/addi-data/addi_common.h
@@ -64,19 +64,20 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
 
 // variable type definition
 
-#define VOID void
-#define UINT unsigned int
-#define ULONG unsigned int     /* 32-bit */
-#define USHORT unsigned short
-#define PUSHORT unsigned short *
-#define INT int
-#define BYTE unsigned char
-#define PBYTE unsigned char *
-#define PINT int *
-#define PUINT unsigned int *
-#define CHAR char
-#define PCHAR char *
-#define PRANGE comedi_lrange   *
+typedef void VOID, *PVOID;
+typedef char CHAR, *PCHAR;
+typedef unsigned char BYTE, *PBYTE;
+typedef short SHORT, *PSHORT;
+typedef unsigned short USHORT, *PUSHORT;
+typedef unsigned short WORD, *PWORD;
+typedef int INT, *PINT;;
+typedef unsigned int UINT, *PUINT;
+typedef int LONG, *PLONG;      /* 32-bit */
+typedef unsigned int ULONG, *PULONG;   /* 32-bit */
+typedef unsigned int DWORD, *PDWORD;   /* 32-bit */
+typedef unsigned long ULONG_PTR;
+
+typedef comedi_lrange *PRANGE;
 #define LOBYTE(W)                                                               (BYTE         )((W)&0xFF)
 #define HIBYTE(W)                                (BYTE         )(((W)>>8)&0xFF)
 #define MAKEWORD(H,L)                            (USHORT       )((L)|( (H)<<8) )
@@ -84,10 +85,6 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
 #define HIWORD(W)                                (USHORT       )(((W)>>16)&0xFFFF)
 #define MAKEDWORD(H,L)                                                 (UINT         )((L)|( (H)<<16) )
 
-#define ULONG_PTR     unsigned long
-#define DWORD         unsigned int     /* 32-bit */
-#define WORD          unsigned short
-
 #define ADDI_ENABLE   1
 #define ADDI_DISABLE  0
 #define APCI1710_SAVE_INTERRUPT 1