[MPlayer-cvslog] r24442 - in trunk/loader: dshow/libwin32.h loader.h registry.h wine/avifmt.h wine/basetsd.h wine/debugtools.h wine/driver.h wine/elfdll.h wine/heap.h wine/ldt.h wine/mmreg.h wine/module.h wine/msacm.h wine/msacmdrv.h wine/ntdef.h wine/pe_image.h wine/poppack.h wine/pshpack1.h wine/pshpack2.h wine/pshpack4.h wine/pshpack8.h wine/vfw.h wine/winbase.h wine/windef.h wine/windows.h wine/winerror.h wine/winestring.h wine/winnt.h wine/winreg.h wine/winuser.h wrapper.h
diego
subversion at mplayerhq.hu
Thu Sep 13 10:50:21 CEST 2007
Author: diego
Date: Thu Sep 13 10:50:21 2007
New Revision: 24442
Log:
Remove leading underscores from multiple inclusion guards,
leading underscores are reserved in the C standard.
Modified:
trunk/loader/dshow/libwin32.h
trunk/loader/loader.h
trunk/loader/registry.h
trunk/loader/wine/avifmt.h
trunk/loader/wine/basetsd.h
trunk/loader/wine/debugtools.h
trunk/loader/wine/driver.h
trunk/loader/wine/elfdll.h
trunk/loader/wine/heap.h
trunk/loader/wine/ldt.h
trunk/loader/wine/mmreg.h
trunk/loader/wine/module.h
trunk/loader/wine/msacm.h
trunk/loader/wine/msacmdrv.h
trunk/loader/wine/ntdef.h
trunk/loader/wine/pe_image.h
trunk/loader/wine/poppack.h
trunk/loader/wine/pshpack1.h
trunk/loader/wine/pshpack2.h
trunk/loader/wine/pshpack4.h
trunk/loader/wine/pshpack8.h
trunk/loader/wine/vfw.h
trunk/loader/wine/winbase.h
trunk/loader/wine/windef.h
trunk/loader/wine/windows.h
trunk/loader/wine/winerror.h
trunk/loader/wine/winestring.h
trunk/loader/wine/winnt.h
trunk/loader/wine/winreg.h
trunk/loader/wine/winuser.h
trunk/loader/wrapper.h
Modified: trunk/loader/dshow/libwin32.h
==============================================================================
--- trunk/loader/dshow/libwin32.h (original)
+++ trunk/loader/dshow/libwin32.h Thu Sep 13 10:50:21 2007
@@ -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 */
Modified: trunk/loader/loader.h
==============================================================================
--- trunk/loader/loader.h (original)
+++ trunk/loader/loader.h Thu Sep 13 10:50:21 2007
@@ -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 instan
#ifdef __cplusplus
}
#endif
-#endif /* __LOADER_H */
+#endif /* LOADER_H */
Modified: trunk/loader/registry.h
==============================================================================
--- trunk/loader/registry.h (original)
+++ trunk/loader/registry.h Thu Sep 13 10:50:21 2007
@@ -31,7 +31,7 @@ long __stdcall RegCreateKeyExA(long key,
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,
Modified: trunk/loader/wine/avifmt.h
==============================================================================
--- trunk/loader/wine/avifmt.h (original)
+++ trunk/loader/wine/avifmt.h Thu Sep 13 10:50:21 2007
@@ -10,7 +10,7 @@
#include "windef.h"
-#ifndef __WINE_MSACM_H
+#ifndef WINE_MSACM_H
typedef DWORD FOURCC;
#endif
Modified: trunk/loader/wine/basetsd.h
==============================================================================
--- trunk/loader/wine/basetsd.h (original)
+++ trunk/loader/wine/basetsd.h Thu Sep 13 10:50:21 2007
@@ -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) */
Modified: trunk/loader/wine/debugtools.h
==============================================================================
--- trunk/loader/wine/debugtools.h (original)
+++ trunk/loader/wine/debugtools.h Thu Sep 13 10:50:21 2007
@@ -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 */
Modified: trunk/loader/wine/driver.h
==============================================================================
--- trunk/loader/wine/driver.h (original)
+++ trunk/loader/wine/driver.h Thu Sep 13 10:50:21 2007
@@ -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 hDriv
#define WINE_GDF_EXIST 0x80000000
#define WINE_GDF_16BIT 0x10000000
-#endif /* __WINE_DRIVER_H */
+#endif /* WINE_DRIVER_H */
Modified: trunk/loader/wine/elfdll.h
==============================================================================
--- trunk/loader/wine/elfdll.h (original)
+++ trunk/loader/wine/elfdll.h Thu Sep 13 10:50:21 2007
@@ -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 *w
void *ELFDLL_dlopen(const char *libname, int flags);
extern char *extra_ld_library_path;
-#endif /* __WINE_ELFDLL_H */
+#endif /* WINE_ELFDLL_H */
Modified: trunk/loader/wine/heap.h
==============================================================================
--- trunk/loader/wine/heap.h (original)
+++ trunk/loader/wine/heap.h Thu Sep 13 10:50:21 2007
@@ -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 */
Modified: trunk/loader/wine/ldt.h
==============================================================================
--- trunk/loader/wine/ldt.h (original)
+++ trunk/loader/wine/ldt.h Thu Sep 13 10:50:21 2007
@@ -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_
#ifdef __cplusplus
}
#endif
-#endif /* __WINE_LDT_H */
+#endif /* WINE_LDT_H */
Modified: trunk/loader/wine/mmreg.h
==============================================================================
--- trunk/loader/wine/mmreg.h (original)
+++ trunk/loader/wine/mmreg.h Thu Sep 13 10:50:21 2007
@@ -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 */
Modified: trunk/loader/wine/module.h
==============================================================================
--- trunk/loader/wine/module.h (original)
+++ trunk/loader/wine/module.h Thu Sep 13 10:50:21 2007
@@ -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( L
/* resource.c */
extern INT WINAPI AccessResource(HMODULE,HRSRC);
-#endif /* __WINE_MODULE_H */
+#endif /* WINE_MODULE_H */
Modified: trunk/loader/wine/msacm.h
==============================================================================
--- trunk/loader/wine/msacm.h (original)
+++ trunk/loader/wine/msacm.h Thu Sep 13 10:50:21 2007
@@ -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 */
Modified: trunk/loader/wine/msacmdrv.h
==============================================================================
--- trunk/loader/wine/msacmdrv.h (original)
+++ trunk/loader/wine/msacmdrv.h Thu Sep 13 10:50:21 2007
@@ -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 */
Modified: trunk/loader/wine/ntdef.h
==============================================================================
--- trunk/loader/wine/ntdef.h (original)
+++ trunk/loader/wine/ntdef.h Thu Sep 13 10:50:21 2007
@@ -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_ATTRI
#include "poppack.h"
-#endif /* __WINE_NTDEF_H */
+#endif /* WINE_NTDEF_H */
Modified: trunk/loader/wine/pe_image.h
==============================================================================
--- trunk/loader/wine/pe_image.h (original)
+++ trunk/loader/wine/pe_image.h Thu Sep 13 10:50:21 2007
@@ -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_LoadLibr
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 */
Modified: trunk/loader/wine/poppack.h
==============================================================================
--- trunk/loader/wine/poppack.h (original)
+++ trunk/loader/wine/poppack.h Thu Sep 13 10:50:21 2007
@@ -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) */
Modified: trunk/loader/wine/pshpack1.h
==============================================================================
--- trunk/loader/wine/pshpack1.h (original)
+++ trunk/loader/wine/pshpack1.h Thu Sep 13 10:50:21 2007
@@ -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) */
Modified: trunk/loader/wine/pshpack2.h
==============================================================================
--- trunk/loader/wine/pshpack2.h (original)
+++ trunk/loader/wine/pshpack2.h Thu Sep 13 10:50:21 2007
@@ -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) */
Modified: trunk/loader/wine/pshpack4.h
==============================================================================
--- trunk/loader/wine/pshpack4.h (original)
+++ trunk/loader/wine/pshpack4.h Thu Sep 13 10:50:21 2007
@@ -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) */
Modified: trunk/loader/wine/pshpack8.h
==============================================================================
--- trunk/loader/wine/pshpack8.h (original)
+++ trunk/loader/wine/pshpack8.h Thu Sep 13 10:50:21 2007
@@ -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) */
Modified: trunk/loader/wine/vfw.h
==============================================================================
--- trunk/loader/wine/vfw.h (original)
+++ trunk/loader/wine/vfw.h Thu Sep 13 10:50:21 2007
@@ -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 */
Modified: trunk/loader/wine/winbase.h
==============================================================================
--- trunk/loader/wine/winbase.h (original)
+++ trunk/loader/wine/winbase.h Thu Sep 13 10:50:21 2007
@@ -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 */
Modified: trunk/loader/wine/windef.h
==============================================================================
--- trunk/loader/wine/windef.h (original)
+++ trunk/loader/wine/windef.h Thu Sep 13 10:50:21 2007
@@ -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
* 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)(
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 */
Modified: trunk/loader/wine/windows.h
==============================================================================
--- trunk/loader/wine/windows.h (original)
+++ trunk/loader/wine/windows.h Thu Sep 13 10:50:21 2007
@@ -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 */
Modified: trunk/loader/wine/winerror.h
==============================================================================
--- trunk/loader/wine/winerror.h (original)
+++ trunk/loader/wine/winerror.h Thu Sep 13 10:50:21 2007
@@ -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 */
Modified: trunk/loader/wine/winestring.h
==============================================================================
--- trunk/loader/wine/winestring.h (original)
+++ trunk/loader/wine/winestring.h Thu Sep 13 10:50:21 2007
@@ -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,LP
#define lstrncmpiA strncasecmp
-#endif /* __WINE_WINESTRING_H */
+#endif /* WINE_WINESTRING_H */
Modified: trunk/loader/wine/winnt.h
==============================================================================
--- trunk/loader/wine/winnt.h (original)
+++ trunk/loader/wine/winnt.h Thu Sep 13 10:50:21 2007
@@ -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 */
Modified: trunk/loader/wine/winreg.h
==============================================================================
--- trunk/loader/wine/winreg.h (original)
+++ trunk/loader/wine/winreg.h Thu Sep 13 10:50:21 2007
@@ -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 */
Modified: trunk/loader/wine/winuser.h
==============================================================================
--- trunk/loader/wine/winuser.h (original)
+++ trunk/loader/wine/winuser.h Thu Sep 13 10:50:21 2007
@@ -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(
}
#endif
-#endif /* _WINE_WINUSER_H */
+#endif /* WINE_WINUSER_H */
Modified: trunk/loader/wrapper.h
==============================================================================
--- trunk/loader/wrapper.h (original)
+++ trunk/loader/wrapper.h Thu Sep 13 10:50:21 2007
@@ -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 */
More information about the MPlayer-cvslog
mailing list