Remove leading underscores from multiple inclusion guards,

leading underscores are reserved in the C standard.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24442 b3059339-0415-0410-9bf9-f77b7e298cf2

loader/dshow/libwin32.h

@@ -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 @@ 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 /* LIBWIN32_H */

loader/loader.h

@@ -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 @@ INT WINAPI LoadStringA( HINSTANCE instance, UINT resource_id,
 #ifdef __cplusplus
 }
 #endif
-#endif /* __LOADER_H */
 
+#endif /* LOADER_H */

loader/registry.h

@@ -31,7 +31,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 WINE_WINERROR_H
 
 long __stdcall RegEnumKeyExA(HKEY hKey, DWORD dwIndex, LPSTR lpName, LPDWORD lpcbName,
 		   LPDWORD lpReserved, LPSTR lpClass, LPDWORD lpcbClass,

loader/wine/avifmt.h

@@ -10,7 +10,7 @@
 
 #include "windef.h"
 
-#ifndef __WINE_MSACM_H
+#ifndef WINE_MSACM_H
 typedef DWORD FOURCC;
 #endif
 

loader/wine/basetsd.h

@@ -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 @@ typedef UINT_PTR SIZE_T, *PSIZE_T;
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
 
-#endif /* !defined(__WINE_BASETSD_H) */
-
-
-
+#endif /* !defined(WINE_BASETSD_H) */

loader/wine/debugtools.h

@@ -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 @@ extern int dbg_printf(const char *format, ...);
 #define DPRINTF dbg_printf
 #define MESSAGE dbg_printf
 
-#endif  /* __WINE_DEBUGTOOLS_H */
+#endif  /* WINE_DEBUGTOOLS_H */

loader/wine/driver.h

@@ -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 @@ DWORD WINAPI GetDriverFlags( HDRVR hDriver );
 #define WINE_GDF_EXIST	0x80000000
 #define WINE_GDF_16BIT	0x10000000
 
-#endif  /* __WINE_DRIVER_H */
+#endif  /* WINE_DRIVER_H */

loader/wine/elfdll.h

@@ -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_UnloadLibrary(WINE_MODREF *wm);
 void *ELFDLL_dlopen(const char *libname, int flags);
 extern char *extra_ld_library_path;
 
-#endif /* __WINE_ELFDLL_H */
+#endif /* WINE_ELFDLL_H */

loader/wine/heap.h

@@ -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 @@ typedef struct
 
 extern SYSTEM_HEAP_DESCR *SystemHeapDescr;
 
-#endif  /* __WINE_HEAP_H */
+#endif  /* WINE_HEAP_H */

loader/wine/ldt.h

@@ -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 @@ extern unsigned char ldt_flags_copy[LDT_SIZE];
 #ifdef __cplusplus
 }
 #endif
-#endif  /* __WINE_LDT_H */
+#endif  /* WINE_LDT_H */

loader/wine/mmreg.h

@@ -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 @@ typedef struct mpeglayer3waveformat_tag {
 #define WAVE_FORMAT_DEVELOPMENT         (0xFFFF)
 
 
-#endif /* __WINE_MMREG_H */
+#endif /* WINE_MMREG_H */

loader/wine/module.h

@@ -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 @@ extern WINE_MODREF *MODULE_FindModule( LPCSTR path );
 /* resource.c */
 extern INT       WINAPI AccessResource(HMODULE,HRSRC); 
 
-#endif  /* __WINE_MODULE_H */
+#endif  /* WINE_MODULE_H */

loader/wine/msacm.h

@@ -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 @@ MMRESULT WINAPI acmStreamUnprepareHeader(
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
 
-#endif  /* __WINE_MSACM_H */
-
-
+#endif  /* WINE_MSACM_H */

loader/wine/msacmdrv.h

@@ -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 @@ typedef struct _ACMDRVFORMATSUGGEST
   DWORD           cbwfxDst;
 } ACMDRVFORMATSUGGEST, *PACMDRVFORMATSUGGEST;
 
-#endif  /* __WINE_MSACMDRV_H */
+#endif  /* WINE_MSACMDRV_H */

loader/wine/ntdef.h

@@ -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 @@ typedef OBJECT_ATTRIBUTES *POBJECT_ATTRIBUTES;
 
 #include "poppack.h"
 
-#endif /* __WINE_NTDEF_H */
+#endif /* WINE_NTDEF_H */

loader/wine/pe_image.h

@@ -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 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 /* WINE_PE_IMAGE_H */

loader/wine/poppack.h

@@ -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) */

loader/wine/pshpack1.h

@@ -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) */
 

loader/wine/pshpack2.h

@@ -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) */

loader/wine/pshpack4.h

@@ -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) */
 

loader/wine/pshpack8.h

@@ -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) */

loader/wine/vfw.h

@@ -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 @@ typedef struct {
 
 #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 @@ typedef struct {
 #ifdef __cplusplus
 }
 #endif
-#endif /* __WINE_VFW_H */
+#endif /* WINE_VFW_H */

loader/wine/winbase.h

@@ -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 @@ VOID        WINAPI SetLastError(DWORD);
 }
 #endif
 
-#endif  /* __WINE_WINBASE_H */
+#endif  /* WINE_WINBASE_H */

loader/wine/windef.h

@@ -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 @@ typedef LRESULT CALLBACK (*WNDPROC)(HWND,UINT,WPARAM,LPARAM);
  * 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 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 /* WINE_WINDEF16_H */
 
 /* Define some empty macros for compatibility with Windows code. */
 
@@ -638,4 +638,4 @@ typedef const RECTL *LPCRECTL;
 }
 #endif
 
-#endif /* __WINE_WINDEF_H */
+#endif /* WINE_WINDEF_H */

loader/wine/windows.h

@@ -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 @@ typedef KANJISTRUCT *PKANJISTRUCT;
 }
 #endif
 
-#endif  /* __WINE_WINDOWS_H */
+#endif  /* WINE_WINDOWS_H */

loader/wine/winerror.h

@@ -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 @@ extern int WIN32_LastError;
 #define OLEOBJ_E_INVALIDVERB            0x00040181L
 #define OLEOBJ_S_INVALIDVERB            0x00040180L
 
-#endif  /* __WINE_WINERROR_H */
+#endif  /* WINE_WINERROR_H */

loader/wine/winestring.h

@@ -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 @@ LPSTR       WINAPI lstrcpynWtoA(LPSTR,LPCWSTR,INT);
 
 #define lstrncmpiA strncasecmp
 
-#endif /* __WINE_WINESTRING_H */
+#endif /* WINE_WINESTRING_H */

loader/wine/winnt.h

@@ -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 @@ typedef enum tagSID_NAME_USE {
 
 #include "poppack.h"
 
-#endif  /* __WINE_WINNT_H */
+#endif  /* WINE_WINNT_H */

loader/wine/winreg.h

@@ -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 @@ typedef ACCESS_MASK REGSAM;
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
 
-#endif  /* __WINE_WINREG_H */
+#endif  /* WINE_WINREG_H */

loader/wine/winuser.h

@@ -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 @@ VOID        WINAPI ScreenSwitchEnable16(WORD);
 }
 #endif
 
-#endif /* _WINE_WINUSER_H */
+#endif /* WINE_WINUSER_H */

loader/wrapper.h

@@ -1,5 +1,5 @@
-#ifndef _WRAPPER_H
-#define _WRAPPER_H
+#ifndef WRAPPER_H
+#define 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 /* WRAPPER_H */