Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 19:33:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fix double declarations/definitions and remove system_header

Browse source 
svn path=/trunk/; revision=37516
This commit is contained in:
Stefan Ginsberg 2008-11-21 15:12:00 +00:00
parent abb1280385
commit 2b96a6cb87
1 changed files with 2 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
reactos/include/psdk/vfw.h
View file

@ -1,8 +1,5 @@
#ifndef _VFW_H #ifndef _VFW_H
#define _VFW_H #define _VFW_H
#if __GNUC__ >= 3
#pragma GCC system_header
#endif
#ifndef _WINDOWS_H #ifndef _WINDOWS_H
#include <windows.h> #include <windows.h>
@ -194,12 +191,6 @@ typedef struct IAVIEditStream *PAVIEDITSTREAM;
#define AVI_HEADERSIZE 2048 #define AVI_HEADERSIZE 2048
#define AVISF_DISABLED 0x01 #define AVISF_DISABLED 0x01
#define AVISF_VIDEO_PALCHANGES 0x10000 #define AVISF_VIDEO_PALCHANGES 0x10000
#define AVIIF_LIST 0x01
#define AVIIF_TWOCC 0x02
#define AVIIF_KEYFRAME 0x10
#define AVIIF_NOTIME 0x100
#define AVIIF_COMPUSE 0xfff0000
#define AVIIF_KEYFRAME 0x10
#define AVIGETFRAMEF_BESTDISPLAYFMT 1 #define AVIGETFRAMEF_BESTDISPLAYFMT 1
#define AVISTREAMINFO_DISABLED 0x01 #define AVISTREAMINFO_DISABLED 0x01
#define AVISTREAMINFO_FORMATCHANGES 0x10000 #define AVISTREAMINFO_FORMATCHANGES 0x10000
@ -720,7 +711,7 @@ DECLARE_INTERFACE_(IAVIStream, IUnknown)
STDMETHOD(WriteData)(THIS_ DWORD,LPVOID,LONG) PURE; STDMETHOD(WriteData)(THIS_ DWORD,LPVOID,LONG) PURE;
STDMETHOD(SetInfo)(THIS_ AVISTREAMINFOW*,LONG) PURE; STDMETHOD(SetInfo)(THIS_ AVISTREAMINFOW*,LONG) PURE;
}; };
typedef IAVIStream *PAVISTREAM; #undef INTERFACE
/***************************************************************************** /*****************************************************************************
* IAVIStreaming interface * IAVIStreaming interface
@ -760,7 +751,7 @@ DECLARE_INTERFACE_(IAVIEditStream, IUnknown)
STDMETHOD(Clone)(THIS_ PAVISTREAM*) PURE; STDMETHOD(Clone)(THIS_ PAVISTREAM*) PURE;
STDMETHOD(SetInfo)(THIS_ LPAVISTREAMINFOW,LONG) PURE; STDMETHOD(SetInfo)(THIS_ LPAVISTREAMINFOW,LONG) PURE;
}; };
typedef IAVIEditStream *PAVIEDITSTREAM; #undef INTERFACE
#define INTERFACE IAVIFile #define INTERFACE IAVIFile
DECLARE_INTERFACE_(IAVIFile, IUnknown) DECLARE_INTERFACE_(IAVIFile, IUnknown)
@ -777,7 +768,6 @@ DECLARE_INTERFACE_(IAVIFile, IUnknown)
STDMETHOD(DeleteStream)(THIS_ DWORD,LONG) PURE; STDMETHOD(DeleteStream)(THIS_ DWORD,LONG) PURE;
}; };
#undef INTERFACE #undef INTERFACE
typedef IAVIFile *PAVIFILE;
#if !defined(__cplusplus) || defined(CINTERFACE) #if !defined(__cplusplus) || defined(CINTERFACE)
/*** IUnknown methods ***/ /*** IUnknown methods ***/