1 files changed, 27 insertions, 22 deletions

diff --git a/src/libw32dll/wine/vfw.h b/src/libw32dll/wine/vfw.h
index e2bc145d8..f05b8d59b 100644
--- a/src/libw32dll/wine/vfw.h
+++ b/src/libw32dll/wine/vfw.h
@@ -1,5 +1,6 @@
 #ifndef __WINE_VFW_H
 #define __WINE_VFW_H
+#define D_VFW 1
 //#include "pshpack1.h"
 #ifdef __cplusplus
 extern "C" {
@@ -15,6 +16,8 @@ typedef struct
     long   bfOffBits;
 } BITMAPFILEHEADER;
 
+#ifndef _BITMAPINFOHEADER_
+#define _BITMAPINFOHEADER_
 typedef struct
 {
     long 	biSize;
@@ -34,6 +37,8 @@ typedef struct {
 	int	bmiColors[1];
 } BITMAPINFO, *LPBITMAPINFO;
 #endif
+
+#endif
 #define VFWAPI	
 #define VFWAPIV	
 #ifndef __WINE_WINDEF_H
@@ -425,7 +430,7 @@ LRESULT VFWAPI ICClose(HIC hic);
 LRESULT	VFWAPI ICSendMessage(HIC hic, unsigned int msg, long dw1, long dw2);
 HIC	VFWAPI ICLocate(long fccType, long fccHandler, LPBITMAPINFOHEADER lpbiIn, LPBITMAPINFOHEADER lpbiOut, short wFlags);
 
-int VFWAPI ICDoSomething();
+int VFWAPI ICDoSomething(void);
 
 long	VFWAPIV	ICDrawBegin(
         HIC			hic,
@@ -602,27 +607,27 @@ typedef struct {
 
 
 typedef struct {
-    long		cbSize;		// set to sizeof(COMPVARS) before

-					// calling ICCompressorChoose

-    long		dwFlags;	// see below...

-    HIC			hic;		// HIC of chosen compressor

-    long               fccType;	// basically ICTYPE_VIDEO

-    long               fccHandler;	// handler of chosen compressor or

-					// "" or "DIB "

-    LPBITMAPINFO	lpbiIn;		// input format

-    LPBITMAPINFO	lpbiOut;	// output format - will compress to this

-    void*		lpBitsOut;

-    void*		lpBitsPrev;

-    long		lFrame;

-    long		lKey;		// key frames how often?

-    long		lDataRate;	// desired data rate KB/Sec

-    long		lQ;		// desired quality

-    long		lKeyCount;

-    void*		lpState;	// state of compressor

-    long		cbState;	// size of the state

-} COMPVARS, *PCOMPVARS;

-

-// FLAGS for dwFlags element of COMPVARS structure:

+    long		cbSize;		// set to sizeof(COMPVARS) before
+					// calling ICCompressorChoose
+    long		dwFlags;	// see below...
+    HIC			hic;		// HIC of chosen compressor
+    long               fccType;	// basically ICTYPE_VIDEO
+    long               fccHandler;	// handler of chosen compressor or
+					// "" or "DIB "
+    LPBITMAPINFO	lpbiIn;		// input format
+    LPBITMAPINFO	lpbiOut;	// output format - will compress to this
+    void*		lpBitsOut;
+    void*		lpBitsPrev;
+    long		lFrame;
+    long		lKey;		// key frames how often?
+    long		lDataRate;	// desired data rate KB/Sec
+    long		lQ;		// desired quality
+    long		lKeyCount;
+    void*		lpState;	// state of compressor
+    long		cbState;	// size of the state
+} COMPVARS, *PCOMPVARS;
+
+// FLAGS for dwFlags element of COMPVARS structure:
 
 
 #define AVIERR_OK		0