Mercurial > mplayer.hg
changeset 24422:c98c9e7f3bd0
Remove leading underscores from multiple inclusion guards,
leading underscores are reserved in the C standard.
author | diego |
---|---|
date | Thu, 13 Sep 2007 08:50:21 +0000 |
parents | 058fc97310e3 |
children | 6af1c486d844 |
files | loader/dshow/libwin32.h loader/loader.h loader/registry.h loader/wine/avifmt.h loader/wine/basetsd.h loader/wine/debugtools.h loader/wine/driver.h loader/wine/elfdll.h loader/wine/heap.h loader/wine/ldt.h loader/wine/mmreg.h loader/wine/module.h loader/wine/msacm.h loader/wine/msacmdrv.h loader/wine/ntdef.h loader/wine/pe_image.h loader/wine/poppack.h loader/wine/pshpack1.h loader/wine/pshpack2.h loader/wine/pshpack4.h loader/wine/pshpack8.h loader/wine/vfw.h loader/wine/winbase.h loader/wine/windef.h loader/wine/windows.h loader/wine/winerror.h loader/wine/winestring.h loader/wine/winnt.h loader/wine/winreg.h loader/wine/winuser.h loader/wrapper.h |
diffstat | 31 files changed, 98 insertions(+), 103 deletions(-) [+] |
line wrap: on
line diff
--- a/loader/dshow/libwin32.h Thu Sep 13 00:17:52 2007 +0000 +++ b/loader/dshow/libwin32.h Thu Sep 13 08:50:21 2007 +0000 @@ -1,5 +1,5 @@ -#ifndef __LIBWIN32_H -#define __LIBWIN32_H +#ifndef LIBWIN32_H +#define LIBWIN32_H #define VFW_E_NOT_RUNNING 0x80040226 @@ -253,4 +253,4 @@ #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 /* LIBWIN32_H */
--- a/loader/loader.h Thu Sep 13 00:17:52 2007 +0000 +++ b/loader/loader.h Thu Sep 13 08:50:21 2007 +0000 @@ -12,8 +12,8 @@ * $Id$ */ -#ifndef _LOADER_H -#define _LOADER_H +#ifndef LOADER_H +#define LOADER_H #ifdef __cplusplus extern "C" { @@ -37,5 +37,5 @@ #ifdef __cplusplus } #endif -#endif /* __LOADER_H */ +#endif /* LOADER_H */
--- a/loader/registry.h Thu Sep 13 00:17:52 2007 +0000 +++ b/loader/registry.h Thu Sep 13 08:50:21 2007 +0000 @@ -31,7 +31,7 @@ long __stdcall RegSetValueExA(long key, const char* name, long v1, long v2, const void* data, long size); -#ifdef __WINE_WINERROR_H +#ifdef WINE_WINERROR_H long __stdcall RegEnumKeyExA(HKEY hKey, DWORD dwIndex, LPSTR lpName, LPDWORD lpcbName, LPDWORD lpReserved, LPSTR lpClass, LPDWORD lpcbClass,
--- a/loader/wine/avifmt.h Thu Sep 13 00:17:52 2007 +0000 +++ b/loader/wine/avifmt.h Thu Sep 13 08:50:21 2007 +0000 @@ -10,7 +10,7 @@ #include "windef.h" -#ifndef __WINE_MSACM_H +#ifndef WINE_MSACM_H typedef DWORD FOURCC; #endif
--- a/loader/wine/basetsd.h Thu Sep 13 00:17:52 2007 +0000 +++ b/loader/wine/basetsd.h Thu Sep 13 08:50:21 2007 +0000 @@ -9,8 +9,8 @@ * $Id$ */ -#ifndef __WINE_BASETSD_H -#define __WINE_BASETSD_H +#ifndef WINE_BASETSD_H +#define WINE_BASETSD_H #include "config.h" @@ -170,7 +170,4 @@ } /* extern "C" */ #endif /* defined(__cplusplus) */ -#endif /* !defined(__WINE_BASETSD_H) */ - - - +#endif /* !defined(WINE_BASETSD_H) */
--- a/loader/wine/debugtools.h Thu Sep 13 00:17:52 2007 +0000 +++ b/loader/wine/debugtools.h Thu Sep 13 08:50:21 2007 +0000 @@ -1,6 +1,6 @@ -#ifndef __WINE_DEBUGTOOLS_H -#define __WINE_DEBUGTOOLS_H +#ifndef WINE_DEBUGTOOLS_H +#define WINE_DEBUGTOOLS_H #include <stdarg.h> #include "config.h" @@ -86,4 +86,4 @@ #define DPRINTF dbg_printf #define MESSAGE dbg_printf -#endif /* __WINE_DEBUGTOOLS_H */ +#endif /* WINE_DEBUGTOOLS_H */
--- a/loader/wine/driver.h Thu Sep 13 00:17:52 2007 +0000 +++ b/loader/wine/driver.h Thu Sep 13 08:50:21 2007 +0000 @@ -2,8 +2,8 @@ * Drivers definitions */ -#ifndef __WINE_DRIVER_H -#define __WINE_DRIVER_H +#ifndef WINE_DRIVER_H +#define WINE_DRIVER_H #include "windef.h" @@ -107,4 +107,4 @@ #define WINE_GDF_EXIST 0x80000000 #define WINE_GDF_16BIT 0x10000000 -#endif /* __WINE_DRIVER_H */ +#endif /* WINE_DRIVER_H */
--- a/loader/wine/elfdll.h Thu Sep 13 00:17:52 2007 +0000 +++ b/loader/wine/elfdll.h Thu Sep 13 08:50:21 2007 +0000 @@ -1,5 +1,5 @@ -#ifndef __WINE_ELFDLL_H -#define __WINE_ELFDLL_H +#ifndef WINE_ELFDLL_H +#define WINE_ELFDLL_H #include "module.h" #include "windef.h" @@ -11,4 +11,4 @@ void *ELFDLL_dlopen(const char *libname, int flags); extern char *extra_ld_library_path; -#endif /* __WINE_ELFDLL_H */ +#endif /* WINE_ELFDLL_H */
--- a/loader/wine/heap.h Thu Sep 13 00:17:52 2007 +0000 +++ b/loader/wine/heap.h Thu Sep 13 08:50:21 2007 +0000 @@ -4,8 +4,8 @@ * Copyright 1996 Alexandre Julliard */ -#ifndef __WINE_HEAP_H -#define __WINE_HEAP_H +#ifndef WINE_HEAP_H +#define WINE_HEAP_H #include "config.h" @@ -53,4 +53,4 @@ extern SYSTEM_HEAP_DESCR *SystemHeapDescr; -#endif /* __WINE_HEAP_H */ +#endif /* WINE_HEAP_H */
--- a/loader/wine/ldt.h Thu Sep 13 00:17:52 2007 +0000 +++ b/loader/wine/ldt.h Thu Sep 13 08:50:21 2007 +0000 @@ -4,8 +4,8 @@ * Copyright 1995 Alexandre Julliard */ -#ifndef __WINE_LDT_H -#define __WINE_LDT_H +#ifndef WINE_LDT_H +#define WINE_LDT_H #include "windef.h" enum seg_type @@ -95,4 +95,4 @@ #ifdef __cplusplus } #endif -#endif /* __WINE_LDT_H */ +#endif /* WINE_LDT_H */
--- a/loader/wine/mmreg.h Thu Sep 13 00:17:52 2007 +0000 +++ b/loader/wine/mmreg.h Thu Sep 13 08:50:21 2007 +0000 @@ -7,8 +7,8 @@ * */ -#ifndef __WINE_MMREG_H -#define __WINE_MMREG_H +#ifndef WINE_MMREG_H +#define WINE_MMREG_H /*********************************************************************** * Defines/Enums @@ -247,4 +247,4 @@ #define WAVE_FORMAT_DEVELOPMENT (0xFFFF) -#endif /* __WINE_MMREG_H */ +#endif /* WINE_MMREG_H */
--- a/loader/wine/module.h Thu Sep 13 00:17:52 2007 +0000 +++ b/loader/wine/module.h Thu Sep 13 08:50:21 2007 +0000 @@ -4,8 +4,8 @@ * Copyright 1995 Alexandre Julliard */ -#ifndef __WINE_MODULE_H -#define __WINE_MODULE_H +#ifndef WINE_MODULE_H +#define WINE_MODULE_H #include "windef.h" #include "pe_image.h" @@ -146,4 +146,4 @@ /* resource.c */ extern INT WINAPI AccessResource(HMODULE,HRSRC); -#endif /* __WINE_MODULE_H */ +#endif /* WINE_MODULE_H */
--- a/loader/wine/msacm.h Thu Sep 13 00:17:52 2007 +0000 +++ b/loader/wine/msacm.h Thu Sep 13 08:50:21 2007 +0000 @@ -2,8 +2,8 @@ * msacm.h - Declarations for MSACM */ -#ifndef __WINE_MSACM_H -#define __WINE_MSACM_H +#ifndef WINE_MSACM_H +#define WINE_MSACM_H #include "windef.h" #include "driver.h" @@ -938,6 +938,4 @@ } /* extern "C" */ #endif /* defined(__cplusplus) */ -#endif /* __WINE_MSACM_H */ - - +#endif /* WINE_MSACM_H */
--- a/loader/wine/msacmdrv.h Thu Sep 13 00:17:52 2007 +0000 +++ b/loader/wine/msacmdrv.h Thu Sep 13 08:50:21 2007 +0000 @@ -2,8 +2,8 @@ * msacmdrv.h - Declarations for MSACM driver */ -#ifndef __WINE_MSACMDRV_H -#define __WINE_MSACMDRV_H +#ifndef WINE_MSACMDRV_H +#define WINE_MSACMDRV_H #include "windef.h" #include "msacm.h" @@ -200,4 +200,4 @@ DWORD cbwfxDst; } ACMDRVFORMATSUGGEST, *PACMDRVFORMATSUGGEST; -#endif /* __WINE_MSACMDRV_H */ +#endif /* WINE_MSACMDRV_H */
--- a/loader/wine/ntdef.h Thu Sep 13 00:17:52 2007 +0000 +++ b/loader/wine/ntdef.h Thu Sep 13 08:50:21 2007 +0000 @@ -1,5 +1,5 @@ -#ifndef __WINE_NTDEF_H -#define __WINE_NTDEF_H +#ifndef WINE_NTDEF_H +#define WINE_NTDEF_H #include "basetsd.h" #include "windef.h" @@ -98,4 +98,4 @@ #include "poppack.h" -#endif /* __WINE_NTDEF_H */ +#endif /* WINE_NTDEF_H */
--- a/loader/wine/pe_image.h Thu Sep 13 00:17:52 2007 +0000 +++ b/loader/wine/pe_image.h Thu Sep 13 08:50:21 2007 +0000 @@ -1,5 +1,5 @@ -#ifndef __WINE_PE_IMAGE_H -#define __WINE_PE_IMAGE_H +#ifndef WINE_PE_IMAGE_H +#define WINE_PE_IMAGE_H #include "winnt.h" #include "winbase.h" @@ -78,4 +78,4 @@ extern void ELF_UnloadLibrary(struct _wine_modref *); extern FARPROC ELF_FindExportedFunction(struct _wine_modref *wm, LPCSTR funcName); -#endif /* __WINE_PE_IMAGE_H */ +#endif /* WINE_PE_IMAGE_H */
--- a/loader/wine/poppack.h Thu Sep 13 00:17:52 2007 +0000 +++ b/loader/wine/poppack.h Thu Sep 13 08:50:21 2007 +0000 @@ -1,5 +1,5 @@ -#ifdef __WINE_PSHPACK_H -#undef __WINE_PSHPACK_H +#ifdef WINE_PSHPACK_H +#undef WINE_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 /* defined(__WINE_PSHPACK_H) */ +#else /* defined(WINE_PSHPACK_H) */ #error "Popping alignment isn't possible since no alignment has been pushed" -#endif /* defined(__WINE_PSHPACK_H) */ +#endif /* defined(WINE_PSHPACK_H) */
--- a/loader/wine/pshpack1.h Thu Sep 13 00:17:52 2007 +0000 +++ b/loader/wine/pshpack1.h Thu Sep 13 08:50:21 2007 +0000 @@ -1,5 +1,5 @@ -#ifndef __WINE_PSHPACK_H -#define __WINE_PSHPACK_H 1 +#ifndef WINE_PSHPACK_H +#define WINE_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 /* !defined(__WINE_PSHPACK_H) */ +#else /* !defined(WINE_PSHPACK_H) */ #error "Nested pushing of alignment isn't supported by the compiler" -#endif /* !defined(__WINE_PSHPACK_H) */ +#endif /* !defined(WINE_PSHPACK_H) */
--- a/loader/wine/pshpack2.h Thu Sep 13 00:17:52 2007 +0000 +++ b/loader/wine/pshpack2.h Thu Sep 13 08:50:21 2007 +0000 @@ -1,5 +1,5 @@ -#ifndef __WINE_PSHPACK_H -#define __WINE_PSHPACK_H 2 +#ifndef WINE_PSHPACK_H +#define WINE_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 /* !defined(__WINE_PSHPACK_H) */ +#else /* !defined(WINE_PSHPACK_H) */ #error "Nested pushing of alignment isn't supported by the compiler" -#endif /* !defined(__WINE_PSHPACK_H) */ +#endif /* !defined(WINE_PSHPACK_H) */
--- a/loader/wine/pshpack4.h Thu Sep 13 00:17:52 2007 +0000 +++ b/loader/wine/pshpack4.h Thu Sep 13 08:50:21 2007 +0000 @@ -1,5 +1,5 @@ -#ifndef __WINE_PSHPACK_H -#define __WINE_PSHPACK_H 4 +#ifndef WINE_PSHPACK_H +#define WINE_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 /* !defined(__WINE_PSHPACK_H) */ +#else /* !defined(WINE_PSHPACK_H) */ #error "Nested pushing of alignment isn't supported by the compiler" -#endif /* !defined(__WINE_PSHPACK_H) */ +#endif /* !defined(WINE_PSHPACK_H) */
--- a/loader/wine/pshpack8.h Thu Sep 13 00:17:52 2007 +0000 +++ b/loader/wine/pshpack8.h Thu Sep 13 08:50:21 2007 +0000 @@ -1,5 +1,5 @@ -#ifndef __WINE_PSHPACK_H -#define __WINE_PSHPACK_H 8 +#ifndef WINE_PSHPACK_H +#define WINE_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 /* !defined(__WINE_PSHPACK_H) */ +#else /* !defined(WINE_PSHPACK_H) */ #error "Nested pushing of alignment isn't supported by the compiler" -#endif /* !defined(__WINE_PSHPACK_H) */ +#endif /* !defined(WINE_PSHPACK_H) */
--- a/loader/wine/vfw.h Thu Sep 13 00:17:52 2007 +0000 +++ b/loader/wine/vfw.h Thu Sep 13 08:50:21 2007 +0000 @@ -4,8 +4,8 @@ * $Id$ */ -#ifndef __WINE_VFW_H -#define __WINE_VFW_H +#ifndef WINE_VFW_H +#define WINE_VFW_H //#include "pshpack1.h" #ifdef __cplusplus extern "C" { @@ -44,7 +44,7 @@ #define VFWAPI #define VFWAPIV -#ifndef __WINE_WINDEF_H +#ifndef WINE_WINDEF_H typedef long (__stdcall__ *DRIVERPROC)(long,HDRVR,unsigned int,long,long); #endif @@ -669,4 +669,4 @@ #ifdef __cplusplus } #endif -#endif /* __WINE_VFW_H */ +#endif /* WINE_VFW_H */
--- a/loader/wine/winbase.h Thu Sep 13 00:17:52 2007 +0000 +++ b/loader/wine/winbase.h Thu Sep 13 08:50:21 2007 +0000 @@ -1,5 +1,5 @@ -#ifndef __WINE_WINBASE_H -#define __WINE_WINBASE_H +#ifndef WINE_WINBASE_H +#define WINE_WINBASE_H #include "basetsd.h" #include "winnt.h" @@ -1782,4 +1782,4 @@ } #endif -#endif /* __WINE_WINBASE_H */ +#endif /* WINE_WINBASE_H */
--- a/loader/wine/windef.h Thu Sep 13 00:17:52 2007 +0000 +++ b/loader/wine/windef.h Thu Sep 13 08:50:21 2007 +0000 @@ -9,8 +9,8 @@ * */ -#ifndef __WINE_WINDEF_H -#define __WINE_WINDEF_H +#ifndef WINE_WINDEF_H +#define WINE_WINDEF_H # include "config.h" @@ -339,8 +339,8 @@ * 16 bit windows code. */ -#ifndef __WINE_WINDEF16_H -#define __WINE_WINDEF16_H +#ifndef WINE_WINDEF16_H +#define WINE_WINDEF16_H #include "windef.h" @@ -454,7 +454,7 @@ typedef LRESULT CALLBACK (*WNDENUMPROC16)(HWND16,LPARAM); typedef LRESULT CALLBACK (*WNDPROC16)(HWND16,UINT16,WPARAM16,LPARAM); -#endif /* __WINE_WINDEF16_H */ +#endif /* WINE_WINDEF16_H */ /* Define some empty macros for compatibility with Windows code. */ @@ -638,4 +638,4 @@ } #endif -#endif /* __WINE_WINDEF_H */ +#endif /* WINE_WINDEF_H */
--- a/loader/wine/windows.h Thu Sep 13 00:17:52 2007 +0000 +++ b/loader/wine/windows.h Thu Sep 13 08:50:21 2007 +0000 @@ -1,5 +1,5 @@ -#ifndef __WINE_WINDOWS_H -#define __WINE_WINDOWS_H +#ifndef WINE_WINDOWS_H +#define WINE_WINDOWS_H #ifdef __cplusplus extern "C" { @@ -35,4 +35,4 @@ } #endif -#endif /* __WINE_WINDOWS_H */ +#endif /* WINE_WINDOWS_H */
--- a/loader/wine/winerror.h Thu Sep 13 00:17:52 2007 +0000 +++ b/loader/wine/winerror.h Thu Sep 13 08:50:21 2007 +0000 @@ -1,5 +1,5 @@ -#ifndef __WINE_WINERROR_H -#define __WINE_WINERROR_H +#ifndef WINE_WINERROR_H +#define WINE_WINERROR_H extern int WIN32_LastError; @@ -1655,4 +1655,4 @@ #define OLEOBJ_E_INVALIDVERB 0x00040181L #define OLEOBJ_S_INVALIDVERB 0x00040180L -#endif /* __WINE_WINERROR_H */ +#endif /* WINE_WINERROR_H */
--- a/loader/wine/winestring.h Thu Sep 13 00:17:52 2007 +0000 +++ b/loader/wine/winestring.h Thu Sep 13 08:50:21 2007 +0000 @@ -1,5 +1,5 @@ -#ifndef __WINE_WINESTRING_H -#define __WINE_WINESTRING_H +#ifndef WINE_WINESTRING_H +#define WINE_WINESTRING_H #include "windef.h" @@ -10,4 +10,4 @@ #define lstrncmpiA strncasecmp -#endif /* __WINE_WINESTRING_H */ +#endif /* WINE_WINESTRING_H */
--- a/loader/wine/winnt.h Thu Sep 13 00:17:52 2007 +0000 +++ b/loader/wine/winnt.h Thu Sep 13 08:50:21 2007 +0000 @@ -4,8 +4,8 @@ * Copyright 1996 Alexandre Julliard */ -#ifndef __WINE_WINNT_H -#define __WINE_WINNT_H +#ifndef WINE_WINNT_H +#define WINE_WINNT_H #include "windef.h" @@ -2660,4 +2660,4 @@ #include "poppack.h" -#endif /* __WINE_WINNT_H */ +#endif /* WINE_WINNT_H */
--- a/loader/wine/winreg.h Thu Sep 13 00:17:52 2007 +0000 +++ b/loader/wine/winreg.h Thu Sep 13 08:50:21 2007 +0000 @@ -1,8 +1,8 @@ /* * Win32 registry defines (see also winnt.h) */ -#ifndef __WINE_WINREG_H -#define __WINE_WINREG_H +#ifndef WINE_WINREG_H +#define WINE_WINREG_H #include "winbase.h" #include "winnt.h" @@ -54,4 +54,4 @@ } /* extern "C" */ #endif /* defined(__cplusplus) */ -#endif /* __WINE_WINREG_H */ +#endif /* WINE_WINREG_H */
--- a/loader/wine/winuser.h Thu Sep 13 00:17:52 2007 +0000 +++ b/loader/wine/winuser.h Thu Sep 13 08:50:21 2007 +0000 @@ -1,5 +1,5 @@ -#ifndef _WINE_WINUSER_H -#define _WINE_WINUSER_H +#ifndef WINE_WINUSER_H +#define WINE_WINUSER_H #ifndef RC_INVOKED #include <stdarg.h> @@ -2926,4 +2926,4 @@ } #endif -#endif /* _WINE_WINUSER_H */ +#endif /* WINE_WINUSER_H */
--- a/loader/wrapper.h Thu Sep 13 00:17:52 2007 +0000 +++ b/loader/wrapper.h Thu Sep 13 08:50:21 2007 +0000 @@ -1,5 +1,5 @@ -#ifndef _WRAPPER_H -#define _WRAPPER_H +#ifndef WRAPPER_H +#define WRAPPER_H #include <inttypes.h> @@ -16,5 +16,5 @@ extern int wrapper(void); extern int null_call(void); -#endif /* _WRAPPER_H */ +#endif /* WRAPPER_H */