mirror of
https://github.com/mpv-player/mpv
synced 2024-07-31 16:29:58 +02:00
Add MPLAYER_ prefix to multiple inclusion guards.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26077 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego
parent
55e51ffed4
commit
bb7b132e08
@ -3,8 +3,8 @@
|
||||
* http://svn.mplayerhq.hu/mplayer/trunk/
|
||||
*/
|
||||
|
||||
#ifndef AVIFILE_COM_H
|
||||
#define AVIFILE_COM_H
|
||||
#ifndef MPLAYER_COM_H
|
||||
#define MPLAYER_COM_H
|
||||
|
||||
#include "config.h"
|
||||
|
||||
@ -91,4 +91,4 @@ void STDCALL CoTaskMemFree(void*);
|
||||
|
||||
#endif /* WIN32 */
|
||||
|
||||
#endif /* AVIFILE_COM_H */
|
||||
#endif /* MPLAYER_COM_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef DEBUG_H
|
||||
#define DEBUG_H
|
||||
#ifndef MPLAYER_DEBUG_H
|
||||
#define MPLAYER_DEBUG_H
|
||||
|
||||
#ifdef DEBUG
|
||||
#define TRACE printf
|
||||
@ -9,4 +9,4 @@
|
||||
#define dbg_printf(...)
|
||||
#endif
|
||||
|
||||
#endif /* DEBUG_H */
|
||||
#endif /* MPLAYER_DEBUG_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef AVIFILE_DMO_AUDIODECODER_H
|
||||
#define AVIFILE_DMO_AUDIODECODER_H
|
||||
#ifndef MPLAYER_DMO_AUDIODECODER_H
|
||||
#define MPLAYER_DMO_AUDIODECODER_H
|
||||
|
||||
typedef struct DMO_AudioDecoder DMO_AudioDecoder;
|
||||
|
||||
@ -14,4 +14,4 @@ int DMO_AudioDecoder_Convert(DMO_AudioDecoder *this, const void* in_data, unsign
|
||||
|
||||
int DMO_AudioDecoder_GetSrcSize(DMO_AudioDecoder *this, int dest_size);
|
||||
|
||||
#endif /* AVIFILE_DMO_AUDIODECODER_H */
|
||||
#endif /* MPLAYER_DMO_AUDIODECODER_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef DMO_FILTER_H
|
||||
#define DMO_FILTER_H
|
||||
#ifndef MPLAYER_DMO_FILTER_H
|
||||
#define MPLAYER_DMO_FILTER_H
|
||||
|
||||
#include "dmo_guids.h"
|
||||
#include "dmo_interfaces.h"
|
||||
@ -44,4 +44,4 @@ CMediaBuffer* CMediaBufferCreate(unsigned long maxlen, void* mem, unsigned long
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* DS_FILTER_H */
|
||||
#endif /* MPLAYER_DMO_FILTER_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef AVIFILE_DMO_VIDEODECODER_H
|
||||
#define AVIFILE_DMO_VIDEODECODER_H
|
||||
#ifndef MPLAYER_DMO_VIDEODECODER_H
|
||||
#define MPLAYER_DMO_VIDEODECODER_H
|
||||
|
||||
typedef struct DMO_VideoDecoder DMO_VideoDecoder;
|
||||
|
||||
@ -23,4 +23,4 @@ int DMO_VideoDecoder_SetDestFmt(DMO_VideoDecoder *this, int bits, unsigned int c
|
||||
int DMO_VideoDecoder_SetDirection(DMO_VideoDecoder *this, int d);
|
||||
|
||||
|
||||
#endif /* AVIFILE_DMO_VIDEODECODER_H */
|
||||
#endif /* MPLAYER_DMO_VIDEODECODER_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef DMO_H
|
||||
#define DMO_H
|
||||
#ifndef MPLAYER_DMO_H
|
||||
#define MPLAYER_DMO_H
|
||||
|
||||
/*
|
||||
*
|
||||
@ -78,4 +78,4 @@ enum DMO_VIDEO_OUTPUT_STREAM_FLAGS
|
||||
#define DMO_E_TYPE_NOT_ACCEPTED 0x80040205
|
||||
#define DMO_E_NO_MORE_ITEMS 0x80040206
|
||||
|
||||
#endif /* DMO_H */
|
||||
#endif /* MPLAYER_DMO_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef DMO_GUIDS_H
|
||||
#define DMO_GUIDS_H
|
||||
#ifndef MPLAYER_DMO_GUIDS_H
|
||||
#define MPLAYER_DMO_GUIDS_H
|
||||
|
||||
#include "dshow/guids.h"
|
||||
|
||||
@ -32,4 +32,4 @@ extern const GUID DMOCATEGORY_AUDIO_NOISE_SUPPRESS;
|
||||
extern const GUID DMOCATEGORY_AGC;
|
||||
*/
|
||||
|
||||
#endif /* DMO_GUIDS_H */
|
||||
#endif /* MPLAYER_DMO_GUIDS_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef DMO_INTERFACE_H
|
||||
#define DMO_INTERFACE_H
|
||||
#ifndef MPLAYER_DMO_INTERFACES_H
|
||||
#define MPLAYER_DMO_INTERFACES_H
|
||||
|
||||
#include "dmo.h"
|
||||
|
||||
@ -191,4 +191,4 @@ typedef struct IDMOVideoOutputOptimizations_vt
|
||||
} IDMOVideoOutputOptimizations_vt;
|
||||
struct IDMOVideoOutputOptimizations { IDMOVideoOutputOptimizations_vt* vt; };
|
||||
|
||||
#endif /* DMO_INTERFACE_H */
|
||||
#endif /* MPLAYER_DMO_INTERFACES_H */
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
* http://svn.mplayerhq.hu/mplayer/trunk/
|
||||
*/
|
||||
|
||||
#ifndef LOADER_DRIVER_H
|
||||
#define LOADER_DRIVER_H
|
||||
#ifndef MPLAYER_DRIVER_H
|
||||
#define MPLAYER_DRIVER_H
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
@ -24,4 +24,4 @@ void DrvClose(HDRVR hdrvr);
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* LOADER_DRIVER_H */
|
||||
#endif /* MPLAYER_DRIVER_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef AVIFILE_DS_AUDIODECODER_H
|
||||
#define AVIFILE_DS_AUDIODECODER_H
|
||||
#ifndef MPLAYER_DS_AUDIODECODER_H
|
||||
#define MPLAYER_DS_AUDIODECODER_H
|
||||
|
||||
typedef struct DS_AudioDecoder DS_AudioDecoder;
|
||||
|
||||
@ -14,4 +14,4 @@ int DS_AudioDecoder_Convert(DS_AudioDecoder *this, const void* in_data, unsigned
|
||||
|
||||
int DS_AudioDecoder_GetSrcSize(DS_AudioDecoder *this, int dest_size);
|
||||
|
||||
#endif /* AVIFILE_DS_AUDIODECODER_H */
|
||||
#endif /* MPLAYER_DS_AUDIODECODER_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef DS_FILTER_H
|
||||
#define DS_FILTER_H
|
||||
#ifndef MPLAYER_DS_FILTER_H
|
||||
#define MPLAYER_DS_FILTER_H
|
||||
|
||||
#include "inputpin.h"
|
||||
#include "outputpin.h"
|
||||
@ -47,4 +47,4 @@ void DS_Filter_Destroy(DS_Filter* This);
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* DS_FILTER_H */
|
||||
#endif /* MPLAYER_DS_FILTER_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef AVIFILE_DS_VIDEODECODER_H
|
||||
#define AVIFILE_DS_VIDEODECODER_H
|
||||
#ifndef MPLAYER_DS_VIDEODECODER_H
|
||||
#define MPLAYER_DS_VIDEODECODER_H
|
||||
|
||||
typedef struct DS_VideoDecoder DS_VideoDecoder;
|
||||
|
||||
@ -26,4 +26,4 @@ int DS_VideoDecoder_SetValue(DS_VideoDecoder *this, const char* name, int value)
|
||||
int DS_SetAttr_DivX(char* attribute, int value);
|
||||
|
||||
|
||||
#endif /* AVIFILE_DS_VIDEODECODER_H */
|
||||
#endif /* MPLAYER_DS_VIDEODECODER_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef DS_ALLOCATOR_H
|
||||
#define DS_ALLOCATOR_H
|
||||
#ifndef MPLAYER_ALLOCATOR_H
|
||||
#define MPLAYER_ALLOCATOR_H
|
||||
|
||||
#include "interfaces.h"
|
||||
#include "cmediasample.h"
|
||||
@ -24,4 +24,4 @@ struct MemAllocator
|
||||
|
||||
MemAllocator* MemAllocatorCreate(void);
|
||||
|
||||
#endif /* DS_ALLOCATOR_H */
|
||||
#endif /* MPLAYER_ALLOCATOR_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef DS_CMEDIASAMPLE_H
|
||||
#define DS_CMEDIASAMPLE_H
|
||||
#ifndef MPLAYER_CMEDIASAMPLE_H
|
||||
#define MPLAYER_CMEDIASAMPLE_H
|
||||
|
||||
#include "interfaces.h"
|
||||
#include "guids.h"
|
||||
@ -29,4 +29,4 @@ CMediaSample* CMediaSampleCreate(IMemAllocator* allocator, int size);
|
||||
// called from allocator
|
||||
void CMediaSample_Destroy(CMediaSample* This);
|
||||
|
||||
#endif /* DS_CMEDIASAMPLE_H */
|
||||
#endif /* MPLAYER_CMEDIASAMPLE_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef DS_GUIDS_H
|
||||
#define DS_GUIDS_H
|
||||
#ifndef MPLAYER_GUIDS_H
|
||||
#define MPLAYER_GUIDS_H
|
||||
|
||||
/*
|
||||
this will be defined if <ole2.h> already included before this file
|
||||
@ -82,4 +82,4 @@ extern const GUID FORMAT_WaveFormatEx;
|
||||
extern const GUID MEDIATYPE_Audio;
|
||||
extern const GUID MEDIASUBTYPE_PCM;
|
||||
|
||||
#endif /* DS_GUIDS_H */
|
||||
#endif /* MPLAYER_GUIDS_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef DS_INPUTPIN_H
|
||||
#define DS_INPUTPIN_H
|
||||
#ifndef MPLAYER_INPUTPIN_H
|
||||
#define MPLAYER_INPUTPIN_H
|
||||
|
||||
#include "interfaces.h"
|
||||
|
||||
@ -67,4 +67,4 @@ typedef struct
|
||||
|
||||
CRemotePin2* CRemotePin2Create(CBaseFilter2* parent);
|
||||
|
||||
#endif /* DS_INPUTPIN_H */
|
||||
#endif /* MPLAYER_INPUTPIN_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef DS_INTERFACES_H
|
||||
#define DS_INTERFACES_H
|
||||
#ifndef MPLAYER_INTERFACES_H
|
||||
#define MPLAYER_INTERFACES_H
|
||||
|
||||
/*
|
||||
* Definition of important DirectShow interfaces.
|
||||
@ -329,4 +329,4 @@ struct IDivxFilterInterface_vt
|
||||
HRESULT STDCALL ( *get_AspectRatio )(IDivxFilterInterface* This, int* x, IDivxFilterInterface* Thisit, int* y);
|
||||
};
|
||||
|
||||
#endif /* DS_INTERFACES_H */
|
||||
#endif /*MPLAYER_INTERFACES_H */
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
* http://svn.mplayerhq.hu/mplayer/trunk/
|
||||
*/
|
||||
|
||||
#ifndef DS_IUNK_H
|
||||
#define DS_IUNK_H
|
||||
#ifndef MPLAYER_IUNK_H
|
||||
#define MPLAYER_IUNK_H
|
||||
|
||||
#include "guids.h"
|
||||
|
||||
@ -51,4 +51,4 @@ static long STDCALL CLASSNAME ## _Release(IUnknown * This) \
|
||||
return 0; \
|
||||
}
|
||||
|
||||
#endif /* DS_IUNK_H */
|
||||
#endif /* MPLAYER_IUNK_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef LIBWIN32_H
|
||||
#define LIBWIN32_H
|
||||
#ifndef MPLAYER_LIBWIN32_H
|
||||
#define MPLAYER_LIBWIN32_H
|
||||
|
||||
#define VFW_E_NOT_RUNNING 0x80040226
|
||||
|
||||
@ -253,4 +253,4 @@ struct IRtConfig
|
||||
#define fccYVU9 mmioFOURCC('Y', 'V', 'U', '9')/* Planar 4:1:0 */
|
||||
#define fccIF09 mmioFOURCC('I', 'F', '0', '9')/* Planar 4:1:0 + delta */
|
||||
|
||||
#endif /* LIBWIN32_H */
|
||||
#endif /* MPLAYER_LIBWIN32_H */
|
||||
|
||||
@ -3,8 +3,10 @@
|
||||
AM_MEDIA_TYPE service functions declarations
|
||||
-------------------------------------------------------------------
|
||||
*/
|
||||
#ifndef DS_MEDIATYPE_H
|
||||
#define DS_MEDIATYPE_H
|
||||
|
||||
#ifndef MPLAYER_MEDIATYPE_H
|
||||
#define MPLAYER_MEDIATYPE_H
|
||||
|
||||
#include "guids.h"
|
||||
|
||||
typedef struct __attribute__((__packed__)) MediaType
|
||||
@ -91,4 +93,4 @@ AM_MEDIA_TYPE* CreateMediaType(const AM_MEDIA_TYPE* pSrc);
|
||||
*/
|
||||
int CompareMediaTypes(const AM_MEDIA_TYPE * pmt1, const AM_MEDIA_TYPE * pmt2, int bWildcards);
|
||||
|
||||
#endif /* DS_MEDIA_TYPE_H */
|
||||
#endif /* MPLAYER_MEDIA_TYPE_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef DS_OUTPUTPIN_H
|
||||
#define DS_OUTPUTPIN_H
|
||||
#ifndef MPLAYER_OUTPUTPIN_H
|
||||
#define MPLAYER_OUTPUTPIN_H
|
||||
|
||||
/* "output pin" - the one that connects to output of filter. */
|
||||
|
||||
@ -29,4 +29,4 @@ struct COutputPin
|
||||
|
||||
COutputPin* COutputPinCreate(const AM_MEDIA_TYPE* amt,SAMPLEPROC SampleProc,void* pUserData);
|
||||
|
||||
#endif /* DS_OUTPUTPIN_H */
|
||||
#endif /* MPLAYER_OUTPUTPIN_H */
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
* http://svn.mplayerhq.hu/mplayer/trunk/
|
||||
*/
|
||||
|
||||
#ifndef LOADER_EXT_H
|
||||
#define LOADER_EXT_H
|
||||
#ifndef MPLAYER_EXT_H
|
||||
#define MPLAYER_EXT_H
|
||||
|
||||
#include "wine/windef.h"
|
||||
|
||||
@ -16,4 +16,4 @@ extern int FILE_munmap( LPVOID start, DWORD size_high, DWORD size_low );
|
||||
extern int wcsnicmp(const unsigned short* s1, const unsigned short* s2, int n);
|
||||
extern int __vprintf( const char *format, ... );
|
||||
|
||||
#endif /* LOADER_EXT_H */
|
||||
#endif /* MPLAYER_EXT_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef LDT_KEEPER_H
|
||||
#define LDT_KEEPER_H
|
||||
#ifndef MPLAYER_LDT_KEEPER_H
|
||||
#define MPLAYER_LDT_KEEPER_H
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
@ -18,4 +18,4 @@ void Restore_LDT_Keeper(ldt_fs_t* ldt_fs);
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* LDT_KEEPER_H */
|
||||
#endif /* MPLAYER_LDT_KEEPER_H */
|
||||
|
||||
@ -11,8 +11,8 @@
|
||||
* http://svn.mplayerhq.hu/mplayer/trunk/
|
||||
*/
|
||||
|
||||
#ifndef LOADER_H
|
||||
#define LOADER_H
|
||||
#ifndef MPLAYER_LOADER_H
|
||||
#define MPLAYER_LOADER_H
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
@ -37,4 +37,4 @@ INT WINAPI LoadStringA( HINSTANCE instance, UINT resource_id,
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* LOADER_H */
|
||||
#endif /* MPLAYER_LOADER_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef QT_COMP_H
|
||||
#define QT_COMP_H
|
||||
#ifndef MPLAYER_QT_COMP_H
|
||||
#define MPLAYER_QT_COMP_H
|
||||
|
||||
DECL_COMPONENT(sorenson3,"SMD_ComponentDispatch",1)
|
||||
DECL_COMPONENT(sorenson,"SorensonYUV9Dispatcher",1)
|
||||
@ -27,4 +27,4 @@ DECL_COMPONENT(mace3d,"Mace3DecompDispatch",0)
|
||||
|
||||
//DECL_COMPONENT(,"",0)
|
||||
|
||||
#endif /* QT_COMP_H */
|
||||
#endif /* MPLAYER_QT_COMP_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef QT_FV_H
|
||||
#define QT_FV_H
|
||||
#ifndef MPLAYER_QT_FV_H
|
||||
#define MPLAYER_QT_FV_H
|
||||
|
||||
typedef struct qt_fv_s {
|
||||
unsigned int id;
|
||||
@ -1588,4 +1588,4 @@ qt_fv_t qt_fv_list[]={
|
||||
{ 0x270029, "TEFeatureFlag"},
|
||||
{ 0,NULL } };
|
||||
|
||||
#endif /* QT_FV_H */
|
||||
#endif /* MPLAYER_QT_FV_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef COMPONENTS_H
|
||||
#define COMPONENTS_H
|
||||
#ifndef MPLAYER_COMPONENTS_H
|
||||
#define MPLAYER_COMPONENTS_H
|
||||
|
||||
#include <inttypes.h>
|
||||
|
||||
@ -744,4 +744,4 @@ static inline void dump_CodecDecompressParams(void* xxx){
|
||||
|
||||
}
|
||||
|
||||
#endif /* COMPONENTS_H */
|
||||
#endif /* MPLAYER_COMPONENTS_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef SELECT_H
|
||||
#define SELECT_H
|
||||
#ifndef MPLAYER_SELECT_H
|
||||
#define MPLAYER_SELECT_H
|
||||
|
||||
enum {
|
||||
kComponentOpenSelect = -1, /* ComponentInstance for this open */
|
||||
@ -69,4 +69,4 @@ enum {
|
||||
kImageCodecCancelTriggerSelect = 0x0209
|
||||
};
|
||||
|
||||
#endif /* SELECT_H */
|
||||
#endif /* MPLAYER_SELECT_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef AVIFILE_REGISTRY_H
|
||||
#define AVIFILE_REGISTRY_H
|
||||
#ifndef MPLAYER_REGISTRY_H
|
||||
#define MPLAYER_REGISTRY_H
|
||||
|
||||
/********************************************************
|
||||
*
|
||||
@ -30,7 +30,7 @@ long __stdcall RegCreateKeyExA(long key, const char* name, long reserved,
|
||||
long __stdcall RegSetValueExA(long key, const char* name, long v1, long v2,
|
||||
const void* data, long size);
|
||||
|
||||
#ifdef WINE_WINERROR_H
|
||||
#ifdef MPLAYER_WINERROR_H
|
||||
|
||||
long __stdcall RegEnumKeyExA(HKEY hKey, DWORD dwIndex, LPSTR lpName, LPDWORD lpcbName,
|
||||
LPDWORD lpReserved, LPSTR lpClass, LPDWORD lpcbClass,
|
||||
@ -42,4 +42,4 @@ long __stdcall RegEnumValueA(HKEY hkey, DWORD index, LPSTR value, LPDWORD val_co
|
||||
};
|
||||
#endif
|
||||
|
||||
#endif /* AVIFILE_REGISTRY_H */
|
||||
#endif /* MPLAYER_REGISTRY_H */
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
* http://svn.mplayerhq.hu/mplayer/trunk/
|
||||
*/
|
||||
|
||||
#ifndef LOADER_WIN32_H
|
||||
#define LOADER_WIN32_H
|
||||
#ifndef MPLAYER_WIN32_H
|
||||
#define MPLAYER_WIN32_H
|
||||
|
||||
#include <time.h>
|
||||
|
||||
@ -40,4 +40,4 @@ typedef struct tls_s tls_t;
|
||||
extern void* LookupExternal(const char* library, int ordinal);
|
||||
extern void* LookupExternalByName(const char* library, const char* name);
|
||||
|
||||
#endif /* LOADER_WIN32_H */
|
||||
#endif /* MPLAYER_WIN32_H */
|
||||
|
||||
@ -3,14 +3,14 @@
|
||||
* AVIFMT - AVI file format definitions
|
||||
*
|
||||
****************************************************************************/
|
||||
#ifndef WINE_AVIFMT_H
|
||||
#define WINE_AVIFMT_H
|
||||
#ifndef MPLAYER_AVIFMT_H
|
||||
#define MPLAYER_AVIFMT_H
|
||||
|
||||
#ifndef WINE_NOAVIFMT_H
|
||||
#ifndef MPLAYER_NOAVIFMT_H
|
||||
|
||||
#include "windef.h"
|
||||
|
||||
#ifndef WINE_MSACM_H
|
||||
#ifndef MPLAYER_MSACM_H
|
||||
typedef DWORD FOURCC;
|
||||
#endif
|
||||
|
||||
@ -236,5 +236,5 @@ typedef struct
|
||||
**
|
||||
** Used in video streams.
|
||||
*/
|
||||
#endif /* WINE_NOAVIFMT_H */
|
||||
#endif /* WINE_AVIFMT_H */
|
||||
#endif /* MPLAYER_NOAVIFMT_H */
|
||||
#endif /* MPLAYER_AVIFMT_H */
|
||||
|
||||
@ -8,8 +8,8 @@
|
||||
* http://svn.mplayerhq.hu/mplayer/trunk/
|
||||
*/
|
||||
|
||||
#ifndef WINE_BASETSD_H
|
||||
#define WINE_BASETSD_H
|
||||
#ifndef MPLAYER_BASETSD_H
|
||||
#define MPLAYER_BASETSD_H
|
||||
|
||||
#include "config.h"
|
||||
|
||||
@ -169,4 +169,4 @@ typedef UINT_PTR SIZE_T, *PSIZE_T;
|
||||
} /* extern "C" */
|
||||
#endif /* defined(__cplusplus) */
|
||||
|
||||
#endif /* WINE_BASETSD_H */
|
||||
#endif /* MPLAYER_BASETSD_H */
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
|
||||
#ifndef WINE_DEBUGTOOLS_H
|
||||
#define WINE_DEBUGTOOLS_H
|
||||
#ifndef MPLAYER_DEBUGTOOLS_H
|
||||
#define MPLAYER_DEBUGTOOLS_H
|
||||
|
||||
#include <stdarg.h>
|
||||
#include "config.h"
|
||||
@ -69,4 +68,4 @@ static inline LPCSTR debugstr_w( LPCWSTR s ) { return debugstr_wn( s, 80 ); }
|
||||
#define DEFAULT_DEBUG_CHANNEL(ch) \
|
||||
extern char dbch_##ch[]; static char * const __dbch_default = dbch_##ch;
|
||||
|
||||
#endif /* WINE_DEBUGTOOLS_H */
|
||||
#endif /* MPLAYER_DEBUGTOOLS_H */
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
* Drivers definitions
|
||||
*/
|
||||
|
||||
#ifndef WINE_DRIVER_H
|
||||
#define WINE_DRIVER_H
|
||||
#ifndef MPLAYER_DRIVER_H
|
||||
#define MPLAYER_DRIVER_H
|
||||
|
||||
#include "windef.h"
|
||||
|
||||
@ -107,4 +107,4 @@ DWORD WINAPI GetDriverFlags( HDRVR hDriver );
|
||||
#define WINE_GDF_EXIST 0x80000000
|
||||
#define WINE_GDF_16BIT 0x10000000
|
||||
|
||||
#endif /* WINE_DRIVER_H */
|
||||
#endif /* MPLAYER_DRIVER_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef WINE_ELFDLL_H
|
||||
#define WINE_ELFDLL_H
|
||||
#ifndef MPLAYER_ELFDLL_H
|
||||
#define MPLAYER_ELFDLL_H
|
||||
|
||||
#include "module.h"
|
||||
#include "windef.h"
|
||||
@ -11,4 +11,4 @@ void ELFDLL_UnloadLibrary(WINE_MODREF *wm);
|
||||
void *ELFDLL_dlopen(const char *libname, int flags);
|
||||
extern char *extra_ld_library_path;
|
||||
|
||||
#endif /* WINE_ELFDLL_H */
|
||||
#endif /* MPLAYER_ELFDLL_H */
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* Copyright 1996 Alexandre Julliard
|
||||
*/
|
||||
|
||||
#ifndef WINE_HEAP_H
|
||||
#define WINE_HEAP_H
|
||||
#ifndef MPLAYER_HEAP_H
|
||||
#define MPLAYER_HEAP_H
|
||||
|
||||
#include "config.h"
|
||||
|
||||
@ -53,4 +53,4 @@ typedef struct
|
||||
|
||||
extern SYSTEM_HEAP_DESCR *SystemHeapDescr;
|
||||
|
||||
#endif /* WINE_HEAP_H */
|
||||
#endif /* MPLAYER_HEAP_H */
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* Copyright 1995 Alexandre Julliard
|
||||
*/
|
||||
|
||||
#ifndef WINE_LDT_H
|
||||
#define WINE_LDT_H
|
||||
#ifndef MPLAYER_LDT_H
|
||||
#define MPLAYER_LDT_H
|
||||
|
||||
#include "windef.h"
|
||||
enum seg_type
|
||||
@ -95,4 +95,5 @@ extern unsigned char ldt_flags_copy[LDT_SIZE];
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
#endif /* WINE_LDT_H */
|
||||
|
||||
#endif /* MPLAYER_LDT_H */
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef WINE_MMREG_H
|
||||
#define WINE_MMREG_H
|
||||
#ifndef MPLAYER_MMREG_H
|
||||
#define MPLAYER_MMREG_H
|
||||
|
||||
/***********************************************************************
|
||||
* Defines/Enums
|
||||
@ -246,4 +246,4 @@ typedef struct mpeglayer3waveformat_tag {
|
||||
#define WAVE_FORMAT_DEVELOPMENT (0xFFFF)
|
||||
|
||||
|
||||
#endif /* WINE_MMREG_H */
|
||||
#endif /* MPLAYER_MMREG_H */
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* Copyright 1995 Alexandre Julliard
|
||||
*/
|
||||
|
||||
#ifndef WINE_MODULE_H
|
||||
#define WINE_MODULE_H
|
||||
#ifndef MPLAYER_MODULE_H
|
||||
#define MPLAYER_MODULE_H
|
||||
|
||||
#include "windef.h"
|
||||
#include "pe_image.h"
|
||||
@ -146,4 +146,4 @@ extern WINE_MODREF *MODULE_FindModule( LPCSTR path );
|
||||
/* resource.c */
|
||||
extern INT WINAPI AccessResource(HMODULE,HRSRC);
|
||||
|
||||
#endif /* WINE_MODULE_H */
|
||||
#endif /* MPLAYER_MODULE_H */
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
* msacm.h - Declarations for MSACM
|
||||
*/
|
||||
|
||||
#ifndef WINE_MSACM_H
|
||||
#define WINE_MSACM_H
|
||||
#ifndef MPLAYER_MSACM_H
|
||||
#define MPLAYER_MSACM_H
|
||||
|
||||
#include "windef.h"
|
||||
#include "driver.h"
|
||||
@ -938,4 +938,4 @@ MMRESULT WINAPI acmStreamUnprepareHeader(
|
||||
} /* extern "C" */
|
||||
#endif /* defined(__cplusplus) */
|
||||
|
||||
#endif /* WINE_MSACM_H */
|
||||
#endif /* MPLAYER_MSACM_H */
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
* msacmdrv.h - Declarations for MSACM driver
|
||||
*/
|
||||
|
||||
#ifndef WINE_MSACMDRV_H
|
||||
#define WINE_MSACMDRV_H
|
||||
#ifndef MPLAYER_MSACMDRV_H
|
||||
#define MPLAYER_MSACMDRV_H
|
||||
|
||||
#include "windef.h"
|
||||
#include "msacm.h"
|
||||
@ -200,4 +200,4 @@ typedef struct ACMDRVFORMATSUGGEST
|
||||
DWORD cbwfxDst;
|
||||
} ACMDRVFORMATSUGGEST, *PACMDRVFORMATSUGGEST;
|
||||
|
||||
#endif /* WINE_MSACMDRV_H */
|
||||
#endif /* MPLAYER_MSACMDRV_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef WINE_NTDEF_H
|
||||
#define WINE_NTDEF_H
|
||||
#ifndef MPLAYER_NTDEF_H
|
||||
#define MPLAYER_NTDEF_H
|
||||
|
||||
#include "basetsd.h"
|
||||
#include "windef.h"
|
||||
@ -98,4 +98,4 @@ typedef OBJECT_ATTRIBUTES *POBJECT_ATTRIBUTES;
|
||||
|
||||
#include "poppack.h"
|
||||
|
||||
#endif /* WINE_NTDEF_H */
|
||||
#endif /* MPLAYER_NTDEF_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef WINE_OBJBASE_H
|
||||
#define WINE_OBJBASE_H
|
||||
#ifndef MPLAYER_OBJBASE_H
|
||||
#define MPLAYER_OBJBASE_H
|
||||
|
||||
#ifndef STDCALL
|
||||
#define STDCALL __attribute__((__stdcall__))
|
||||
@ -17,4 +17,4 @@ HRESULT STDCALL CoInitialize(LPVOID pvReserved);
|
||||
HRESULT STDCALL CoInitializeEx(LPVOID pvReserved, DWORD dwCoinit);
|
||||
void STDCALL CoUninitialize(void);
|
||||
|
||||
#endif /* WINE_OBJBASE_H */
|
||||
#endif /* MPLAYER_OBJBASE_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef WINE_PE_IMAGE_H
|
||||
#define WINE_PE_IMAGE_H
|
||||
#ifndef MPLAYER_PE_IMAGE_H
|
||||
#define MPLAYER_PE_IMAGE_H
|
||||
|
||||
#include "winnt.h"
|
||||
#include "winbase.h"
|
||||
@ -78,4 +78,4 @@ extern struct wine_modref *ELF_LoadLibraryExA( LPCSTR libname, DWORD flags);
|
||||
extern void ELF_UnloadLibrary(struct wine_modref *);
|
||||
extern FARPROC ELF_FindExportedFunction(struct wine_modref *wm, LPCSTR funcName);
|
||||
|
||||
#endif /* WINE_PE_IMAGE_H */
|
||||
#endif /* MPLAYER_PE_IMAGE_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifdef WINE_PSHPACK_H
|
||||
#undef WINE_PSHPACK_H
|
||||
#ifdef MPLAYER_PSHPACK_H
|
||||
#undef MPLAYER_PSHPACK_H
|
||||
|
||||
#if (defined(__GNUC__) || defined(__SUNPRO_C)) && !defined(__APPLE__)
|
||||
#pragma pack()
|
||||
@ -10,6 +10,6 @@
|
||||
#error "Restoration of the previous alignment isn't supported by the compiler"
|
||||
#endif /* defined(__GNUC__) || defined(__SUNPRO_C) ; !defined(RC_INVOKED) */
|
||||
|
||||
#else /* WINE_PSHPACK_H */
|
||||
#else /* MPLAYER_PSHPACK_H */
|
||||
#error "Popping alignment isn't possible since no alignment has been pushed"
|
||||
#endif /* WINE_PSHPACK_H */
|
||||
#endif /* MPLAYER_PSHPACK_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef WINE_PSHPACK_H
|
||||
#define WINE_PSHPACK_H 1
|
||||
#ifndef MPLAYER_PSHPACK_H
|
||||
#define MPLAYER_PSHPACK_H 1
|
||||
|
||||
#if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
|
||||
//#pragma pack(1)
|
||||
@ -7,7 +7,7 @@
|
||||
#error "1 as alignment isn't supported by the compiler"
|
||||
#endif /* defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) ; !defined(RC_INVOKED) */
|
||||
|
||||
#else /* WINE_PSHPACK_H */
|
||||
#else /* MPLAYER_PSHPACK_H */
|
||||
#error "Nested pushing of alignment isn't supported by the compiler"
|
||||
#endif /* WINE_PSHPACK_H */
|
||||
#endif /* MPLAYER_PSHPACK_H */
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef WINE_PSHPACK_H
|
||||
#define WINE_PSHPACK_H 2
|
||||
#ifndef MPLAYER_PSHPACK_H
|
||||
#define MPLAYER_PSHPACK_H 2
|
||||
|
||||
#if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
|
||||
//#pragma pack(2)
|
||||
@ -7,6 +7,6 @@
|
||||
#error "2 as alignment isn't supported by the compiler"
|
||||
#endif /* defined(__GNUC__) || defined(__SUNPRO_CC) ; !defined(RC_INVOKED) */
|
||||
|
||||
#else /* WINE_PSHPACK_H */
|
||||
#else /* MPLAYER_PSHPACK_H */
|
||||
#error "Nested pushing of alignment isn't supported by the compiler"
|
||||
#endif /* WINE_PSHPACK_H */
|
||||
#endif /* MPLAYER_PSHPACK_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef WINE_PSHPACK_H
|
||||
#define WINE_PSHPACK_H 4
|
||||
#ifndef MPLAYER_PSHPACK_H
|
||||
#define MPLAYER_PSHPACK_H 4
|
||||
|
||||
#if defined(__GNUC__) || defined(__SUNPRO_CC)
|
||||
//#pragma pack(4)
|
||||
@ -9,7 +9,7 @@
|
||||
#error "4 as alignment isn't supported by the compiler"
|
||||
#endif /* defined(__GNUC__) || defined(__SUNPRO_CC) ; !defined(RC_INVOKED) */
|
||||
|
||||
#else /* WINE_PSHPACK_H */
|
||||
#else /* MPLAYER_PSHPACK_H */
|
||||
#error "Nested pushing of alignment isn't supported by the compiler"
|
||||
#endif /* WINE_PSHPACK_H */
|
||||
#endif /* MPLAYER_PSHPACK_H */
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef WINE_PSHPACK_H
|
||||
#define WINE_PSHPACK_H 8
|
||||
#ifndef MPLAYER_PSHPACK_H
|
||||
#define MPLAYER_PSHPACK_H 8
|
||||
|
||||
#if 0
|
||||
//#pragma pack(8)
|
||||
@ -7,6 +7,6 @@
|
||||
#error "8 as alignment is not supported"
|
||||
#endif /* 0 ; !defined(RC_INVOKED) */
|
||||
|
||||
#else /* WINE_PSHPACK_H */
|
||||
#else /* MPLAYER_PSHPACK_H */
|
||||
#error "Nested pushing of alignment isn't supported by the compiler"
|
||||
#endif /* WINE_PSHPACK_H */
|
||||
#endif /* MPLAYER_PSHPACK_H */
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
* http://svn.mplayerhq.hu/mplayer/trunk/
|
||||
*/
|
||||
|
||||
#ifndef WINE_VFW_H
|
||||
#define WINE_VFW_H
|
||||
#ifndef MPLAYER_VFW_H
|
||||
#define MPLAYER_VFW_H
|
||||
//#include "pshpack1.h"
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
@ -43,7 +43,7 @@ typedef struct {
|
||||
|
||||
#define VFWAPI
|
||||
#define VFWAPIV
|
||||
#ifndef WINE_WINDEF_H
|
||||
#ifndef MPLAYER_WINDEF_H
|
||||
typedef long (__stdcall__ *DRIVERPROC)(long,HDRVR,unsigned int,long,long);
|
||||
#endif
|
||||
|
||||
@ -668,4 +668,4 @@ typedef struct {
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
#endif /* WINE_VFW_H */
|
||||
#endif /* MPLAYER_VFW_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef WINE_WINBASE_H
|
||||
#define WINE_WINBASE_H
|
||||
#ifndef MPLAYER_WINBASE_H
|
||||
#define MPLAYER_WINBASE_H
|
||||
|
||||
#include "basetsd.h"
|
||||
#include "winnt.h"
|
||||
@ -1782,4 +1782,4 @@ VOID WINAPI SetLastError(DWORD);
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* WINE_WINBASE_H */
|
||||
#endif /* MPLAYER_WINBASE_H */
|
||||
|
||||
@ -8,8 +8,8 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef WINE_WINDEF_H
|
||||
#define WINE_WINDEF_H
|
||||
#ifndef MPLAYER_WINDEF_H
|
||||
#define MPLAYER_WINDEF_H
|
||||
|
||||
# include "config.h"
|
||||
|
||||
@ -338,8 +338,8 @@ typedef LRESULT CALLBACK (*WNDPROC)(HWND,UINT,WPARAM,LPARAM);
|
||||
* 16 bit windows code.
|
||||
*/
|
||||
|
||||
#ifndef WINE_WINDEF16_H
|
||||
#define WINE_WINDEF16_H
|
||||
#ifndef MPLAYER_WINDEF16_H
|
||||
#define MPLAYER_WINDEF16_H
|
||||
|
||||
#include "windef.h"
|
||||
|
||||
@ -453,7 +453,7 @@ typedef VOID CALLBACK (*TIMERPROC16)(HWND16,UINT16,UINT16,DWORD);
|
||||
typedef LRESULT CALLBACK (*WNDENUMPROC16)(HWND16,LPARAM);
|
||||
typedef LRESULT CALLBACK (*WNDPROC16)(HWND16,UINT16,WPARAM16,LPARAM);
|
||||
|
||||
#endif /* WINE_WINDEF16_H */
|
||||
#endif /* MPLAYER_WINDEF16_H */
|
||||
|
||||
/* Define some empty macros for compatibility with Windows code. */
|
||||
|
||||
@ -637,4 +637,4 @@ typedef const RECTL *LPCRECTL;
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* WINE_WINDEF_H */
|
||||
#endif /* MPLAYER_WINDEF_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef WINE_WINDOWS_H
|
||||
#define WINE_WINDOWS_H
|
||||
#ifndef MPLAYER_WINDOWS_H
|
||||
#define MPLAYER_WINDOWS_H
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
@ -35,4 +35,4 @@ typedef KANJISTRUCT *PKANJISTRUCT;
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* WINE_WINDOWS_H */
|
||||
#endif /* MPLAYER_WINDOWS_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef WINE_WINERROR_H
|
||||
#define WINE_WINERROR_H
|
||||
#ifndef MPLAYER_WINERROR_H
|
||||
#define MPLAYER_WINERROR_H
|
||||
|
||||
|
||||
extern int WIN32_LastError;
|
||||
@ -1655,4 +1655,4 @@ extern int WIN32_LastError;
|
||||
#define OLEOBJ_E_INVALIDVERB 0x00040181L
|
||||
#define OLEOBJ_S_INVALIDVERB 0x00040180L
|
||||
|
||||
#endif /* WINE_WINERROR_H */
|
||||
#endif /* MPLAYER_WINERROR_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef WINE_WINESTRING_H
|
||||
#define WINE_WINESTRING_H
|
||||
#ifndef MPLAYER_WINESTRING_H
|
||||
#define MPLAYER_WINESTRING_H
|
||||
|
||||
#include "windef.h"
|
||||
|
||||
@ -10,4 +10,4 @@ LPSTR WINAPI lstrcpynWtoA(LPSTR,LPCWSTR,INT);
|
||||
|
||||
#define lstrncmpiA strncasecmp
|
||||
|
||||
#endif /* WINE_WINESTRING_H */
|
||||
#endif /* MPLAYER_WINESTRING_H */
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* Copyright 1996 Alexandre Julliard
|
||||
*/
|
||||
|
||||
#ifndef WINE_WINNT_H
|
||||
#define WINE_WINNT_H
|
||||
#ifndef MPLAYER_WINNT_H
|
||||
#define MPLAYER_WINNT_H
|
||||
|
||||
#include "windef.h"
|
||||
|
||||
@ -2659,4 +2659,4 @@ typedef enum tagSID_NAME_USE {
|
||||
|
||||
#include "poppack.h"
|
||||
|
||||
#endif /* WINE_WINNT_H */
|
||||
#endif /* MPLAYER_WINNT_H */
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
/*
|
||||
* Win32 registry defines (see also winnt.h)
|
||||
*/
|
||||
#ifndef WINE_WINREG_H
|
||||
#define WINE_WINREG_H
|
||||
#ifndef MPLAYER_WINREG_H
|
||||
#define MPLAYER_WINREG_H
|
||||
|
||||
#include "winbase.h"
|
||||
#include "winnt.h"
|
||||
@ -54,4 +54,4 @@ typedef ACCESS_MASK REGSAM;
|
||||
} /* extern "C" */
|
||||
#endif /* defined(__cplusplus) */
|
||||
|
||||
#endif /* WINE_WINREG_H */
|
||||
#endif /* MPLAYER_WINREG_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef WINE_WINUSER_H
|
||||
#define WINE_WINUSER_H
|
||||
#ifndef MPLAYER_WINUSER_H
|
||||
#define MPLAYER_WINUSER_H
|
||||
|
||||
#ifndef RC_INVOKED
|
||||
#include <stdarg.h>
|
||||
@ -2926,4 +2926,4 @@ VOID WINAPI ScreenSwitchEnable16(WORD);
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* WINE_WINUSER_H */
|
||||
#endif /* MPLAYER_WINUSER_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef WINEACM_H
|
||||
#define WINEACM_H
|
||||
#ifndef MPLAYER_WINEACM_H
|
||||
#define MPLAYER_WINEACM_H
|
||||
/* -*- tab-width: 8; c-basic-offset: 4 -*- */
|
||||
|
||||
/***********************************************************************
|
||||
@ -69,4 +69,4 @@ PWINE_ACMOBJ MSACM_GetObj(HACMOBJ hObj);
|
||||
} /* extern "C" */
|
||||
#endif /* defined(__cplusplus) */
|
||||
|
||||
#endif /* WINEACM_H */
|
||||
#endif /* MPLAYER_WINEACM_H */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef WRAPPER_H
|
||||
#define WRAPPER_H
|
||||
#ifndef MPLAYER_WRAPPER_H
|
||||
#define MPLAYER_WRAPPER_H
|
||||
|
||||
#include <inttypes.h>
|
||||
|
||||
@ -16,5 +16,5 @@ extern void (*wrapper_target)(void);
|
||||
extern int wrapper(void);
|
||||
extern int null_call(void);
|
||||
|
||||
#endif /* WRAPPER_H */
|
||||
#endif /* MPLAYER_WRAPPER_H */
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user