[Mplayer-dev-eng] diff for alpha

[Jean-Francois Beleyn]

diff from last cvs for alpha

not sure if i changed thing at the right place ...

greetings
gianfranco
-------------- next part --------------
diff -r -u2 MPlayer-20010816/loader/DirectShow/libwin32.h MPlayer-alpha/loader/DirectShow/libwin32.h
--- MPlayer-20010816/loader/DirectShow/libwin32.h	Thu Aug 16 02:50:02 2001
+++ MPlayer-alpha/loader/DirectShow/libwin32.h	Thu Aug 16 19:33:43 2001
@@ -58,6 +58,6 @@
 #ifndef mmioFOURCC
 #define mmioFOURCC( ch0, ch1, ch2, ch3 )				\
-		( (long)(unsigned char)(ch0) | ( (long)(unsigned char)(ch1) << 8 ) |	\
-		( (long)(unsigned char)(ch2) << 16 ) | ( (long)(unsigned char)(ch3) << 24 ) )
+		( (int32_t)(unsigned char)(ch0) | ( (int32_t)(unsigned char)(ch1) << 8 ) |	\
+		( (int32_t)(unsigned char)(ch2) << 16 ) | ( (int32_t)(unsigned char)(ch3) << 24 ) )
 #endif /* mmioFOURCC */
 
diff -r -u2 MPlayer-20010816/loader/wine/vfw.h MPlayer-alpha/loader/wine/vfw.h
--- MPlayer-20010816/loader/wine/vfw.h	Sat Jul 14 19:00:38 2001
+++ MPlayer-alpha/loader/wine/vfw.h	Thu Aug 16 20:15:51 2001
@@ -20,15 +20,15 @@
 typedef struct
 {
-    long 	biSize;
-    long  	biWidth;
-    long  	biHeight;
+    DWORD 	biSize;
+    DWORD  	biWidth;
+    DWORD  	biHeight;
     short 	biPlanes;
     short 	biBitCount;
-    long 	biCompression;
-    long 	biSizeImage;
-    long  	biXPelsPerMeter;
-    long  	biYPelsPerMeter;
-    long 	biClrUsed;
-    long 	biClrImportant;
+    DWORD	biCompression;
+    DWORD	biSizeImage;
+    DWORD 	biXPelsPerMeter;
+    DWORD 	biYPelsPerMeter;
+    DWORD	biClrUsed;
+    DWORD	biClrImportant;
 } BITMAPINFOHEADER, *PBITMAPINFOHEADER, *LPBITMAPINFOHEADER;
 typedef struct {
@@ -49,6 +49,6 @@
 #ifndef mmioFOURCC
 #define mmioFOURCC( ch0, ch1, ch2, ch3 )				\
-	( (long)(unsigned char)(ch0) | ( (long)(unsigned char)(ch1) << 8 ) |		\
-	( (long)(unsigned char)(ch2) << 16 ) | ( (long)(unsigned char)(ch3) << 24 ) )
+	( (int32_t)(unsigned char)(ch0) | ( (int32_t)(unsigned char)(ch1) << 8 ) |		\
+	( (int32_t)(unsigned char)(ch2) << 16 ) | ( (int32_t)(unsigned char)(ch3) << 24 ) )
 #endif
 
diff -r -u2 MPlayer-20010816/loader/wine/windef.h MPlayer-alpha/loader/wine/windef.h
--- MPlayer-20010816/loader/wine/windef.h	Thu Mar 22 00:55:01 2001
+++ MPlayer-alpha/loader/wine/windef.h	Thu Aug 16 19:53:00 2001
@@ -151,5 +151,5 @@
 typedef unsigned int    UINT;
 typedef unsigned short  WORD;
-typedef unsigned long   DWORD;
+typedef int32_t   	DWORD;
 typedef unsigned long   ULONG;
 typedef unsigned char   BYTE;
Only in MPlayer-alpha/mp3lib: .depend
diff -r -u2 MPlayer-20010816/mp3lib/decod386.c MPlayer-alpha/mp3lib/decod386.c
--- MPlayer-20010816/mp3lib/decod386.c	Sat Jul 14 18:52:09 2001
+++ MPlayer-alpha/mp3lib/decod386.c	Thu Aug 16 20:01:47 2001
@@ -14,5 +14,5 @@
 #include "../config.h"
 
-#if 0
+#if ARCH_ALPHA 
  /* old WRITE_SAMPLE */
    /* is portable */