# HG changeset patch
# User diego
# Date 1185865447 0
# Node ID 88bed2131f19e5f57b7dbe1afd862ce16c7ba45a
# Parent  aa6833574b038b11247b64a3545b952f429ee819
Identifiers starting with underscores are reserved.

diff -r aa6833574b03 -r 88bed2131f19 mixer.h
--- a/mixer.h	Tue Jul 31 06:57:57 2007 +0000
+++ b/mixer.h	Tue Jul 31 07:04:07 2007 +0000
@@ -1,5 +1,5 @@
-#ifndef __MPLAYER_MIXER
-#define __MPLAYER_MIXER
+#ifndef MPLAYER_MIXER_H
+#define MPLAYER_MIXER_H
 
 #include "libaf/af.h"
 #include "libao2/audio_out.h"
@@ -29,4 +29,4 @@
 //extern void mixer_setbothvolume( int v );
 #define mixer_setbothvolume(m, v) mixer_setvolume(m, v, v)
 
-#endif
+#endif /* MPLAYER_MIXER_H */
diff -r aa6833574b03 -r 88bed2131f19 mplayer.h
--- a/mplayer.h	Tue Jul 31 06:57:57 2007 +0000
+++ b/mplayer.h	Tue Jul 31 07:04:07 2007 +0000
@@ -1,6 +1,6 @@
 
-#ifndef __MPLAYER_MAIN
-#define __MPLAYER_MAIN
+#ifndef MPLAYER_H
+#define MPLAYER_H
 
 extern char* current_module;
 
@@ -56,4 +56,4 @@
 extern void exit_player(const char* how);
 extern void update_set_of_subtitles(void);
 
-#endif
+#endif /* MPLAYER_H */
diff -r aa6833574b03 -r 88bed2131f19 osdep/timer.h
--- a/osdep/timer.h	Tue Jul 31 06:57:57 2007 +0000
+++ b/osdep/timer.h	Tue Jul 31 07:04:07 2007 +0000
@@ -1,5 +1,5 @@
-#ifndef __TIMER_H
-#define __TIMER_H
+#ifndef MPLAYER_TIMER_H
+#define MPLAYER_TIMER_H
 
 extern const char *timer_name;
 
@@ -16,4 +16,4 @@
 extern unsigned set_timer_callback(unsigned ms,timer_callback func);
 extern void restore_timer(void);
 
-#endif
+#endif /* MPLAYER_TIMER_H */
diff -r aa6833574b03 -r 88bed2131f19 vidix/glint_regs.h
--- a/vidix/glint_regs.h	Tue Jul 31 06:57:57 2007 +0000
+++ b/vidix/glint_regs.h	Tue Jul 31 07:04:07 2007 +0000
@@ -14,8 +14,8 @@
  *
  */ 
 
-#ifndef _GLINTREG_H_
-#define _GLINTREG_H_
+#ifndef GLINT_REGS_H
+#define GLINT_REGS_H
 
 /**********************************************
 *  GLINT 500TX Configuration Region Registers *
@@ -1301,4 +1301,4 @@
 #define ACCESSCHIP2()						\
     pGlint->IOOffset = 0x10000;
 
-#endif
+#endif /* GLINT_REGS_H */
diff -r aa6833574b03 -r 88bed2131f19 vidix/mach64.h
--- a/vidix/mach64.h	Tue Jul 31 06:57:57 2007 +0000
+++ b/vidix/mach64.h	Tue Jul 31 07:04:07 2007 +0000
@@ -22,8 +22,8 @@
  *  radeonfb, GATOS (gatos.sf.net) and X11 (www.xfree86.org)
  */
 
-#ifndef __MACH64_INCLUDED
-#define __MACH64_INCLUDED 1
+#ifndef MACH64_H
+#define MACH64_H
 
 /* Note: this model of accessing to IO space is based on MMIO technology.
 This means that this sources don't support ISA and VLB cards */
@@ -2494,4 +2494,4 @@
 #define MIX_FN_PAINT			MIX_SRC
 
 
-#endif
+#endif /* MACH64_H */
diff -r aa6833574b03 -r 88bed2131f19 vidix/pm3_regs.h
--- a/vidix/pm3_regs.h	Tue Jul 31 06:57:57 2007 +0000
+++ b/vidix/pm3_regs.h	Tue Jul 31 07:04:07 2007 +0000
@@ -11,8 +11,8 @@
  *
  */ 
 
-#ifndef _PM3_REG_H_
-#define _PM3_REG_H_
+#ifndef PM3_REGS_H
+#define PM3_REGS_H
 
 /**********************************************
 *  GLINT Permedia3 Control Status registers   *
@@ -1110,4 +1110,4 @@
     temp = READ_REG(PM3RD_IndexedData);			\
 }
 #endif
-#endif /* _PM3_REG_H_ */
+#endif /* PM3_REGS_H */
diff -r aa6833574b03 -r 88bed2131f19 vidix/radeon.h
--- a/vidix/radeon.h	Tue Jul 31 06:57:57 2007 +0000
+++ b/vidix/radeon.h	Tue Jul 31 07:04:07 2007 +0000
@@ -22,8 +22,8 @@
  * and partly compatible with Rage128 set (in OV0, CAP0, CAP1 parts)
  */
 
-#ifndef	_RADEON_H
-#define	_RADEON_H
+#ifndef	RADEON_H
+#define	RADEON_H
 
 #define	RADEON_REGSIZE			0x4000
 #define	MM_INDEX			0x0000
diff -r aa6833574b03 -r 88bed2131f19 vidix/savage_regs.h
--- a/vidix/savage_regs.h	Tue Jul 31 06:57:57 2007 +0000
+++ b/vidix/savage_regs.h	Tue Jul 31 07:04:07 2007 +0000
@@ -1,7 +1,7 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h,v 1.10 2001/11/04 22:17:48 alanh Exp $ */
 
-#ifndef _SAVAGE_REGS_H
-#define _SAVAGE_REGS_H
+#ifndef SAVAGE_REGS_H
+#define SAVAGE_REGS_H
 
 /* These are here until xf86PciInfo.h is updated. */
 
@@ -300,4 +300,4 @@
                            & VSCALING_Mask)
 
 
-#endif /* _SAVAGE_REGS_H */
+#endif /* SAVAGE_REGS_H */
diff -r aa6833574b03 -r 88bed2131f19 vidix/sysdep/AsmMacros_alpha.h
--- a/vidix/sysdep/AsmMacros_alpha.h	Tue Jul 31 06:57:57 2007 +0000
+++ b/vidix/sysdep/AsmMacros_alpha.h	Tue Jul 31 07:04:07 2007 +0000
@@ -4,8 +4,8 @@
    Modified for readability by Nick Kurshev
 */
 
-#ifndef __ASM_MACROS_ALPHA_H
-#define __ASM_MACROS_ALPHA_H
+#ifndef ASMMACROS_ALPHA_H
+#define ASMMACROS_ALPHA_H
 #if defined (linux)
 #include <sys/io.h>
 #elif defined (__FreeBSD__)
@@ -23,4 +23,4 @@
 #define intr_disable()
 #define intr_enable()
 
-#endif
+#endif /* ASMMACROS_ALPHA_H */
diff -r aa6833574b03 -r 88bed2131f19 vidix/sysdep/AsmMacros_arm32.h
--- a/vidix/sysdep/AsmMacros_arm32.h	Tue Jul 31 06:57:57 2007 +0000
+++ b/vidix/sysdep/AsmMacros_arm32.h	Tue Jul 31 07:04:07 2007 +0000
@@ -4,8 +4,8 @@
    Modified for readability by Nick Kurshev
 */
 
-#ifndef __ASM_MACROS_ARM32_H
-#define __ASM_MACROS_ARM32_H
+#ifndef ASMMACROS_ARM32_H
+#define ASMMACROS_ARM32_H
 unsigned int IOPortBase;  /* Memory mapped I/O port area */
 
 static __inline__ void outb(short port,char val)
@@ -47,4 +47,4 @@
 #define intr_disable()
 #define intr_enable()
 
-#endif
+#endif /* ASMMACROS_ARM32_H */
diff -r aa6833574b03 -r 88bed2131f19 vidix/sysdep/AsmMacros_ia64.h
--- a/vidix/sysdep/AsmMacros_ia64.h	Tue Jul 31 06:57:57 2007 +0000
+++ b/vidix/sysdep/AsmMacros_ia64.h	Tue Jul 31 07:04:07 2007 +0000
@@ -4,8 +4,8 @@
    Modified for readability by Nick Kurshev
 */
 
-#ifndef __ASM_MACROS_IA64_H
-#define __ASM_MACROS_IA64_H
+#ifndef ASMMACROS_IA64_H
+#define ASMMACROS_IA64_H
 
 #if defined(linux)
 #include <sys/io.h>
@@ -13,4 +13,4 @@
 #error This stuff is not ported on your system
 #endif
 
-#endif
+#endif /* ASMMACROS_IA64_H */
diff -r aa6833574b03 -r 88bed2131f19 vidix/sysdep/AsmMacros_powerpc.h
--- a/vidix/sysdep/AsmMacros_powerpc.h	Tue Jul 31 06:57:57 2007 +0000
+++ b/vidix/sysdep/AsmMacros_powerpc.h	Tue Jul 31 07:04:07 2007 +0000
@@ -4,8 +4,8 @@
    Modified for readability by Nick Kurshev
 */
 
-#ifndef __ASM_MACROS_POWERPC_H
-#define __ASM_MACROS_POWERPC_H
+#ifndef ASMMACROS_POWERPC_H
+#define ASMMACROS_POWERPC_H
 
 #if defined(Lynx) || defined(__OpenBSD__)
 
@@ -57,4 +57,4 @@
 
 #endif
 
-#endif
+#endif /* ASMMACROS_POWERPC_H */
diff -r aa6833574b03 -r 88bed2131f19 vidix/sysdep/AsmMacros_sparc.h
--- a/vidix/sysdep/AsmMacros_sparc.h	Tue Jul 31 06:57:57 2007 +0000
+++ b/vidix/sysdep/AsmMacros_sparc.h	Tue Jul 31 07:04:07 2007 +0000
@@ -4,8 +4,8 @@
    Modified for readability by Nick Kurshev
 */
 
-#ifndef __ASM_MACROS_SPARC_H
-#define __ASM_MACROS_SPARC_H
+#ifndef ASMMACROS_SPARC_H
+#define ASMMACROS_SPARC_H
 
 #ifndef ASI_PL
 #define ASI_PL 0x88
@@ -50,4 +50,4 @@
 #define intr_disable()
 #define intr_enable()
 
-#endif
+#endif /* ASMMACROS_SPARC_H */
diff -r aa6833574b03 -r 88bed2131f19 vidix/sysdep/AsmMacros_x86.h
--- a/vidix/sysdep/AsmMacros_x86.h	Tue Jul 31 06:57:57 2007 +0000
+++ b/vidix/sysdep/AsmMacros_x86.h	Tue Jul 31 07:04:07 2007 +0000
@@ -4,8 +4,8 @@
    Modified for readability by Nick Kurshev
 */
 
-#ifndef __ASM_MACROS_X86_H
-#define __ASM_MACROS_X86_H
+#ifndef ASMMACROS_X86_H
+#define ASMMACROS_X86_H
 
 //#if defined (WINNT)
 //#error This stuff is not ported on your system
@@ -290,4 +290,4 @@
 
 #endif
 
-//#endif
+//#endif /* ASMMACROS_X86_H */
diff -r aa6833574b03 -r 88bed2131f19 vidix/unichrome_regs.h
--- a/vidix/unichrome_regs.h	Tue Jul 31 06:57:57 2007 +0000
+++ b/vidix/unichrome_regs.h	Tue Jul 31 07:04:07 2007 +0000
@@ -23,8 +23,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef _VIA_H_
-#define _VIA_H_ 1
+#ifndef UNICHROME_REGS_H
+#define UNICHROME_REGS_H
 
 /* Video status flag */
 
@@ -632,4 +632,4 @@
 
 
 
-#endif /* _VIA_H_ */
+#endif /* UNICHROME_REGS_H */