summaryrefslogtreecommitdiffstats
path: root/loader
diff options
context:
space:
mode:
Diffstat (limited to 'loader')
-rw-r--r--loader/com.h6
-rw-r--r--loader/debug.h6
-rw-r--r--loader/dmo/DMO_AudioDecoder.h6
-rw-r--r--loader/dmo/DMO_Filter.h6
-rw-r--r--loader/dmo/DMO_VideoDecoder.h6
-rw-r--r--loader/dmo/dmo.h6
-rw-r--r--loader/dmo/dmo_guids.h6
-rw-r--r--loader/dmo/dmo_interfaces.h6
-rw-r--r--loader/driver.h6
-rw-r--r--loader/dshow/DS_AudioDecoder.h6
-rw-r--r--loader/dshow/DS_Filter.h6
-rw-r--r--loader/dshow/DS_VideoDecoder.h6
-rw-r--r--loader/dshow/allocator.h6
-rw-r--r--loader/dshow/cmediasample.h6
-rw-r--r--loader/dshow/guids.h6
-rw-r--r--loader/dshow/inputpin.h6
-rw-r--r--loader/dshow/interfaces.h6
-rw-r--r--loader/dshow/iunk.h6
-rw-r--r--loader/dshow/libwin32.h6
-rw-r--r--loader/dshow/mediatype.h8
-rw-r--r--loader/dshow/outputpin.h6
-rw-r--r--loader/ext.h6
-rw-r--r--loader/ldt_keeper.h6
-rw-r--r--loader/loader.h6
-rw-r--r--loader/qt_comp.h6
-rw-r--r--loader/qt_fv.h6
-rw-r--r--loader/qtx/qtxsdk/components.h6
-rw-r--r--loader/qtx/qtxsdk/select.h6
-rw-r--r--loader/registry.h8
-rw-r--r--loader/win32.h6
-rw-r--r--loader/wine/avifmt.h12
-rw-r--r--loader/wine/basetsd.h6
-rw-r--r--loader/wine/debugtools.h7
-rw-r--r--loader/wine/driver.h6
-rw-r--r--loader/wine/elfdll.h6
-rw-r--r--loader/wine/heap.h6
-rw-r--r--loader/wine/ldt.h7
-rw-r--r--loader/wine/mmreg.h6
-rw-r--r--loader/wine/module.h6
-rw-r--r--loader/wine/msacm.h6
-rw-r--r--loader/wine/msacmdrv.h6
-rw-r--r--loader/wine/ntdef.h6
-rw-r--r--loader/wine/objbase.h6
-rw-r--r--loader/wine/pe_image.h6
-rw-r--r--loader/wine/poppack.h8
-rw-r--r--loader/wine/pshpack1.h8
-rw-r--r--loader/wine/pshpack2.h8
-rw-r--r--loader/wine/pshpack4.h8
-rw-r--r--loader/wine/pshpack8.h8
-rw-r--r--loader/wine/vfw.h8
-rw-r--r--loader/wine/winbase.h6
-rw-r--r--loader/wine/windef.h12
-rw-r--r--loader/wine/windows.h6
-rw-r--r--loader/wine/winerror.h6
-rw-r--r--loader/wine/winestring.h6
-rw-r--r--loader/wine/winnt.h6
-rw-r--r--loader/wine/winreg.h6
-rw-r--r--loader/wine/winuser.h6
-rw-r--r--loader/wineacm.h6
-rw-r--r--loader/wrapper.h6
60 files changed, 196 insertions, 194 deletions
diff --git a/loader/com.h b/loader/com.h
index 6bab624bbe..3e9c1f3692 100644
--- a/loader/com.h
+++ b/loader/com.h
@@ -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 */
diff --git a/loader/debug.h b/loader/debug.h
index f9d0e6b9c4..ad3c9d5a46 100644
--- a/loader/debug.h
+++ b/loader/debug.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 */
diff --git a/loader/dmo/DMO_AudioDecoder.h b/loader/dmo/DMO_AudioDecoder.h
index 9ad00d1193..b4b3dc66e9 100644
--- a/loader/dmo/DMO_AudioDecoder.h
+++ b/loader/dmo/DMO_AudioDecoder.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 */
diff --git a/loader/dmo/DMO_Filter.h b/loader/dmo/DMO_Filter.h
index 090bc2f4c0..ca04b2c4cd 100644
--- a/loader/dmo/DMO_Filter.h
+++ b/loader/dmo/DMO_Filter.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 */
diff --git a/loader/dmo/DMO_VideoDecoder.h b/loader/dmo/DMO_VideoDecoder.h
index 53d971d762..9e6269be22 100644
--- a/loader/dmo/DMO_VideoDecoder.h
+++ b/loader/dmo/DMO_VideoDecoder.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 */
diff --git a/loader/dmo/dmo.h b/loader/dmo/dmo.h
index 845a853e5c..b6eeb7410e 100644
--- a/loader/dmo/dmo.h
+++ b/loader/dmo/dmo.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 */
diff --git a/loader/dmo/dmo_guids.h b/loader/dmo/dmo_guids.h
index db9cb179aa..51e93c9a2c 100644
--- a/loader/dmo/dmo_guids.h
+++ b/loader/dmo/dmo_guids.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 */
diff --git a/loader/dmo/dmo_interfaces.h b/loader/dmo/dmo_interfaces.h
index 01ccc2e339..d0e72f227f 100644
--- a/loader/dmo/dmo_interfaces.h
+++ b/loader/dmo/dmo_interfaces.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 */
diff --git a/loader/driver.h b/loader/driver.h
index e1d4188c54..343c652811 100644
--- a/loader/driver.h
+++ b/loader/driver.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 */
diff --git a/loader/dshow/DS_AudioDecoder.h b/loader/dshow/DS_AudioDecoder.h
index 6b3196ff76..0b09d3b19c 100644
--- a/loader/dshow/DS_AudioDecoder.h
+++ b/loader/dshow/DS_AudioDecoder.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 */
diff --git a/loader/dshow/DS_Filter.h b/loader/dshow/DS_Filter.h
index 69f9918424..8fda4b4ef2 100644
--- a/loader/dshow/DS_Filter.h
+++ b/loader/dshow/DS_Filter.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 */
diff --git a/loader/dshow/DS_VideoDecoder.h b/loader/dshow/DS_VideoDecoder.h
index b68c808836..b686554b89 100644
--- a/loader/dshow/DS_VideoDecoder.h
+++ b/loader/dshow/DS_VideoDecoder.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 */
diff --git a/loader/dshow/allocator.h b/loader/dshow/allocator.h
index 0efa3d886f..71597b3634 100644
--- a/loader/dshow/allocator.h
+++ b/loader/dshow/allocator.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 */
diff --git a/loader/dshow/cmediasample.h b/loader/dshow/cmediasample.h
index e16fd613db..a874dc2289 100644
--- a/loader/dshow/cmediasample.h
+++ b/loader/dshow/cmediasample.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 */
diff --git a/loader/dshow/guids.h b/loader/dshow/guids.h
index a29c309aef..5666ec3041 100644
--- a/loader/dshow/guids.h
+++ b/loader/dshow/guids.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 */
diff --git a/loader/dshow/inputpin.h b/loader/dshow/inputpin.h
index b36b2f0739..02f1c8b98f 100644
--- a/loader/dshow/inputpin.h
+++ b/loader/dshow/inputpin.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 */
diff --git a/loader/dshow/interfaces.h b/loader/dshow/interfaces.h
index ffa5753370..8cac9712b8 100644
--- a/loader/dshow/interfaces.h
+++ b/loader/dshow/interfaces.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 */
diff --git a/loader/dshow/iunk.h b/loader/dshow/iunk.h
index e50c09fee5..0c2aee300b 100644
--- a/loader/dshow/iunk.h
+++ b/loader/dshow/iunk.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 */
diff --git a/loader/dshow/libwin32.h b/loader/dshow/libwin32.h
index 762c8e86b5..7570072649 100644
--- a/loader/dshow/libwin32.h
+++ b/loader/dshow/libwin32.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 */
diff --git a/loader/dshow/mediatype.h b/loader/dshow/mediatype.h
index 9e3734545c..c58bb32e9f 100644
--- a/loader/dshow/mediatype.h
+++ b/loader/dshow/mediatype.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 */
diff --git a/loader/dshow/outputpin.h b/loader/dshow/outputpin.h
index 03c5134f8b..111ea17a56 100644
--- a/loader/dshow/outputpin.h
+++ b/loader/dshow/outputpin.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 */
diff --git a/loader/ext.h b/loader/ext.h
index e1b2258161..17cbf64f57 100644
--- a/loader/ext.h
+++ b/loader/ext.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 */
diff --git a/loader/ldt_keeper.h b/loader/ldt_keeper.h
index e2626e39b5..c339987635 100644
--- a/loader/ldt_keeper.h
+++ b/loader/ldt_keeper.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 */
diff --git a/loader/loader.h b/loader/loader.h
index 9838af1125..29c13ef522 100644
--- a/loader/loader.h
+++ b/loader/loader.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 */
diff --git a/loader/qt_comp.h b/loader/qt_comp.h
index dc20506625..4c1d8d165c 100644
--- a/loader/qt_comp.h
+++ b/loader/qt_comp.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 */
diff --git a/loader/qt_fv.h b/loader/qt_fv.h
index 354b12c98b..94ae02c867 100644
--- a/loader/qt_fv.h
+++ b/loader/qt_fv.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 */
diff --git a/loader/qtx/qtxsdk/components.h b/loader/qtx/qtxsdk/components.h
index 6b616ed98b..e1415a94cd 100644
--- a/loader/qtx/qtxsdk/components.h
+++ b/loader/qtx/qtxsdk/components.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 */
diff --git a/loader/qtx/qtxsdk/select.h b/loader/qtx/qtxsdk/select.h
index cf0b890224..61cc67d371 100644
--- a/loader/qtx/qtxsdk/select.h
+++ b/loader/qtx/qtxsdk/select.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 */
diff --git a/loader/registry.h b/loader/registry.h
index 36fadf204a..4e5e708f30 100644
--- a/loader/registry.h
+++ b/loader/registry.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 */
diff --git a/loader/win32.h b/loader/win32.h
index 57d5cce4fd..8f72352a6e 100644
--- a/loader/win32.h
+++ b/loader/win32.h
@@ -3,8 +3,8 @@
* http://svn.mplayerhq.hu/mplayer/trunk/
*/
-#ifndef LOADER_WIN32_H