Index: src/win/wddbmp.c
===================================================================
RCS file: /cvsroot/alleg/allegro/src/win/wddbmp.c,v
retrieving revision 1.36
diff -u -r1.36 wddbmp.c
--- src/win/wddbmp.c	14 May 2005 15:54:52 -0000	1.36
+++ src/win/wddbmp.c	16 May 2005 19:31:27 -0000
@@ -328,7 +328,7 @@
    bmp->y_ofs = 0;
    bmp->seg = _video_ds();
    for (i = 0; i < h; i++)
-      bmp->line[i] = pseudo_surf_mem;
+      bmp->line[i] = (unsigned char *)pseudo_surf_mem;
 
    bmp->extra = surf;
 
Index: src/win/wddlock.c
===================================================================
RCS file: /cvsroot/alleg/allegro/src/win/wddlock.c,v
retrieving revision 1.22
diff -u -r1.22 wddlock.c
--- src/win/wddlock.c	14 May 2005 15:54:52 -0000	1.22
+++ src/win/wddlock.c	16 May 2005 19:49:23 -0000
@@ -112,7 +112,7 @@
 
 	    /* lock failed, use pseudo surface memory */
 	    surf->flags |= DDRAW_SURFACE_LOST;
-	    data = pseudo_surf_mem;
+	    data = (unsigned char *)pseudo_surf_mem;
 	    pitch = 0;
 	 } 
 	 else {
Index: src/win/wddraw.c
===================================================================
RCS file: /cvsroot/alleg/allegro/src/win/wddraw.c,v
retrieving revision 1.37
diff -u -r1.37 wddraw.c
--- src/win/wddraw.c	14 May 2005 15:54:52 -0000	1.37
+++ src/win/wddraw.c	16 May 2005 19:45:27 -0000
@@ -161,7 +161,7 @@
    drv->h = h;
    drv->linear = 1;
    ddsCaps.dwCaps = DDSCAPS_VIDEOMEMORY;
-   IDirectDraw2_GetAvailableVidMem(directdraw, &ddsCaps, &drv->vid_mem, NULL);
+   IDirectDraw2_GetAvailableVidMem(directdraw, &ddsCaps, (DWORD *)&drv->vid_mem, NULL);
    drv->vid_mem += w * h * BYTES_PER_PIXEL(color_depth);
 
    /* create our pseudo surface memory */
@@ -185,7 +185,7 @@
 int finalize_directx_init(void)
 {
    HRESULT hr;
-   long int freq;
+   DWORD freq;
 
    /* set current refresh rate */
    hr = IDirectDraw2_GetMonitorFrequency(directdraw, &freq);
@@ -193,7 +193,7 @@
    if (FAILED(hr))
       _set_current_refresh_rate(0);
    else
-      _set_current_refresh_rate(freq);
+      _set_current_refresh_rate((int)freq);
 
    return 0;
 }
Index: src/win/wdsound.c
===================================================================
RCS file: /cvsroot/alleg/allegro/src/win/wdsound.c,v
retrieving revision 1.46
diff -u -r1.46 wdsound.c
--- src/win/wdsound.c	14 May 2005 15:54:52 -0000	1.46
+++ src/win/wdsound.c	16 May 2005 19:55:04 -0000
@@ -615,7 +615,8 @@
 static int fill_dsound_buffer(LPDIRECTSOUNDBUFFER snd_buf, int offset, int len, int bits, int stereo, int reversed, char *data)
 {
    void *buf_a;
-   long int size, size_a;
+   long int size;
+   DWORD size_a;
    HRESULT hr;
 
    /* transform from samples to bytes */
@@ -906,7 +907,7 @@
 static void *digi_directsound_lock_voice(int voice, int start, int end)
 {
    LPDIRECTSOUNDBUFFER ds_locked_buffer;
-   long size_a;
+   DWORD size_a;
    void *buf_a;
    HRESULT hr;
 
@@ -984,9 +985,9 @@
 static int digi_directsound_get_position(int voice)
 {
    HRESULT hr;
-   long int play_cursor;
-   long int write_cursor;
-   long int status;
+   DWORD play_cursor;
+   DWORD write_cursor;
+   DWORD status;
    int pos;
 
    if (ds_voices[voice].looping && ds_voices[voice].ds_loop_buffer) {
Index: src/win/wgdi.c
===================================================================
RCS file: /cvsroot/alleg/allegro/src/win/wgdi.c,v
retrieving revision 1.35
diff -u -r1.35 wgdi.c
--- src/win/wgdi.c	14 May 2005 15:54:52 -0000	1.35
+++ src/win/wgdi.c	16 May 2005 20:00:37 -0000
@@ -114,7 +114,6 @@
 /* hardware mouse cursor emulation */
 static int mouse_on = FALSE;
 static int mouse_was_on = FALSE;
-static BITMAP *mouse_sprite = NULL;
 static BITMAP *mouse_frontbuffer = NULL;
 static BITMAP *mouse_backbuffer = NULL;
 static int mouse_xfocus, mouse_yfocus;
Index: src/win/wkeybd.c
===================================================================
RCS file: /cvsroot/alleg/allegro/src/win/wkeybd.c,v
retrieving revision 1.34
diff -u -r1.34 wkeybd.c
--- src/win/wkeybd.c	14 May 2005 15:54:52 -0000	1.34
+++ src/win/wkeybd.c	16 May 2005 20:03:20 -0000
@@ -361,9 +361,9 @@
 static void key_dinput_handle(void)
 {
    static DIDEVICEOBJECTDATA scancode_buffer[DINPUT_BUFFERSIZE];
-   long int waiting_scancodes;
+   DWORD waiting_scancodes;
    HRESULT hr;
-   int i;
+   DWORD i;
 
    /* the whole buffer is free */
    waiting_scancodes = DINPUT_BUFFERSIZE;
@@ -406,7 +406,7 @@
 {
    HRESULT hr;
    int mask, state;
-   char key_state[256];
+   BYTE key_state[256];
 
    if (key_dinput_device) {
       mask = KB_SCROLOCK_FLAG | KB_NUMLOCK_FLAG | KB_CAPSLOCK_FLAG;
Index: src/win/wmouse.c
===================================================================
RCS file: /cvsroot/alleg/allegro/src/win/wmouse.c,v
retrieving revision 1.45
diff -u -r1.45 wmouse.c
--- src/win/wmouse.c	14 May 2005 15:54:52 -0000	1.45
+++ src/win/wmouse.c	16 May 2005 20:04:12 -0000
@@ -307,9 +307,9 @@
 static void mouse_dinput_handle(void)
 {
    static DIDEVICEOBJECTDATA message_buffer[DINPUT_BUFFERSIZE];
-   long int waiting_messages;
+   DWORD waiting_messages;
    HRESULT hr;
-   int i;
+   DWORD i;
 
    /* the whole buffer is free */
    waiting_messages = DINPUT_BUFFERSIZE;
Index: src/win/wsndwo.c
===================================================================
RCS file: /cvsroot/alleg/allegro/src/win/wsndwo.c,v
retrieving revision 1.19
diff -u -r1.19 wsndwo.c
--- src/win/wsndwo.c	16 May 2005 12:40:48 -0000	1.19
+++ src/win/wsndwo.c	16 May 2005 19:58:37 -0000
@@ -119,7 +119,7 @@
 /* sound driver globals */
 static HWAVEOUT hWaveOut = NULL;
 static LPWAVEHDR lpWaveHdr = NULL;
-static long int initial_volume;
+static DWORD initial_volume;
 static int digiwobufsize, digiwobufdivs, digiwobufpos;
 static unsigned char * digiwobufdata = NULL;
 static int _freq, _bits, _stereo;
@@ -280,7 +280,7 @@
    }
 
    lpWaveHdr = malloc(sizeof(WAVEHDR));
-   lpWaveHdr->lpData = digiwobufdata;
+   lpWaveHdr->lpData = (char *)digiwobufdata;
    lpWaveHdr->dwBufferLength = digiwobufsize;
    lpWaveHdr->dwFlags = WHDR_BEGINLOOP | WHDR_ENDLOOP;
    lpWaveHdr->dwLoops = 0x7fffffffL;