diff options
-rw-r--r-- | mixer.h | 6 | ||||
-rw-r--r-- | mplayer.h | 6 | ||||
-rw-r--r-- | osdep/timer.h | 6 | ||||
-rw-r--r-- | vidix/glint_regs.h | 6 | ||||
-rw-r--r-- | vidix/mach64.h | 6 | ||||
-rw-r--r-- | vidix/pm3_regs.h | 6 | ||||
-rw-r--r-- | vidix/radeon.h | 4 | ||||
-rw-r--r-- | vidix/savage_regs.h | 6 | ||||
-rw-r--r-- | vidix/sysdep/AsmMacros_alpha.h | 6 | ||||
-rw-r--r-- | vidix/sysdep/AsmMacros_arm32.h | 6 | ||||
-rw-r--r-- | vidix/sysdep/AsmMacros_ia64.h | 6 | ||||
-rw-r--r-- | vidix/sysdep/AsmMacros_powerpc.h | 6 | ||||
-rw-r--r-- | vidix/sysdep/AsmMacros_sparc.h | 6 | ||||
-rw-r--r-- | vidix/sysdep/AsmMacros_x86.h | 6 | ||||
-rw-r--r-- | vidix/unichrome_regs.h | 6 |
15 files changed, 44 insertions, 44 deletions
@@ -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 @@ void mixer_setbalance(mixer_t *mixer, float bal); //extern void mixer_setbothvolume( int v ); #define mixer_setbothvolume(m, v) mixer_setvolume(m, v, v) -#endif +#endif /* MPLAYER_MIXER_H */ @@ -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 int vobsub_id; extern void exit_player(const char* how); extern void update_set_of_subtitles(void); -#endif +#endif /* MPLAYER_H */ diff --git a/osdep/timer.h b/osdep/timer.h index c45ebc754b..f0e87a89b7 100644 --- a/osdep/timer.h +++ b/osdep/timer.h @@ -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 @@ typedef void timer_callback( void ); extern unsigned set_timer_callback(unsigned ms,timer_callback func); extern void restore_timer(void); -#endif +#endif /* MPLAYER_TIMER_H */ diff --git a/vidix/glint_regs.h b/vidix/glint_regs.h index f33accd3df..86064cf2c1 100644 --- a/vidix/glint_regs.h +++ b/vidix/glint_regs.h @@ -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 @@ do{ \ #define ACCESSCHIP2() \ pGlint->IOOffset = 0x10000; -#endif +#endif /* GLINT_REGS_H */ diff --git a/vidix/mach64.h b/vidix/mach64.h index 3e97a09e48..e018aaca34 100644 --- a/vidix/mach64.h +++ b/vidix/mach64.h @@ -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 @@ This means that this sources don't support ISA and VLB cards */ #define MIX_FN_PAINT MIX_SRC -#endif +#endif /* MACH64_H */ diff --git a/vidix/pm3_regs.h b/vidix/pm3_regs.h index 30c717f44b..0ace0cbd30 100644 --- a/vidix/pm3_regs.h +++ b/vidix/pm3_regs.h @@ -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 @@ do{ \ temp = READ_REG(PM3RD_IndexedData); \ } #endif -#endif /* _PM3_REG_H_ */ +#endif /* PM3_REGS_H */ diff --git a/vidix/radeon.h b/vidix/radeon.h index 8e9212e6b5..6f8000f587 100644 --- a/vidix/radeon.h +++ b/vidix/radeon.h @@ -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 --git a/vidix/savage_regs.h b/vidix/savage_regs.h index 0272e87b4b..6e3d1a6bae 100644 --- a/vidix/savage_regs.h +++ b/vidix/savage_regs.h @@ -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 @@ do { \ & VSCALING_Mask) -#endif /* _SAVAGE_REGS_H */ +#endif /* SAVAGE_REGS_H */ diff --git a/vidix/sysdep/AsmMacros_alpha.h b/vidix/sysdep/AsmMacros_alpha.h index 482b59000e..77d7f5c224 100644 --- a/vidix/sysdep/AsmMacros_alpha.h +++ b/vidix/sysdep/AsmMacros_alpha.h @@ -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 @@ extern u_int32_t inl(u_int32_t port); #define intr_disable() #define intr_enable() -#endif +#endif /* ASMMACROS_ALPHA_H */ diff --git a/vidix/sysdep/AsmMacros_arm32.h b/vidix/sysdep/AsmMacros_arm32.h index e618d32ee0..56e3407efb 100644 --- a/vidix/sysdep/AsmMacros_arm32.h +++ b/vidix/sysdep/AsmMacros_arm32.h @@ -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 @@ static __inline__ unsigned int inl(short port) #define intr_disable() #define intr_enable() -#endif +#endif /* ASMMACROS_ARM32_H */ diff --git a/vidix/sysdep/AsmMacros_ia64.h b/vidix/sysdep/AsmMacros_ia64.h index e59732fda5..ed4d42bb55 100644 --- a/vidix/sysdep/AsmMacros_ia64.h +++ b/vidix/sysdep/AsmMacros_ia64.h @@ -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 --git a/vidix/sysdep/AsmMacros_powerpc.h b/vidix/sysdep/AsmMacros_powerpc.h index 2e1edee2ae..33e191afb3 100644 --- a/vidix/sysdep/AsmMacros_powerpc.h +++ b/vidix/sysdep/AsmMacros_powerpc.h @@ -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 @@ static __inline__ unsigned long inl(short port) #endif -#endif +#endif /* ASMMACROS_POWERPC_H */ diff --git a/vidix/sysdep/AsmMacros_sparc.h b/vidix/sysdep/AsmMacros_sparc.h index f6717b4bb7..f20515b740 100644 --- a/vidix/sysdep/AsmMacros_sparc.h +++ b/vidix/sysdep/AsmMacros_sparc.h @@ -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 @@ static __inline__ unsigned int inl(unsigned long port) #define intr_disable() #define intr_enable() -#endif +#endif /* ASMMACROS_SPARC_H */ diff --git a/vidix/sysdep/AsmMacros_x86.h b/vidix/sysdep/AsmMacros_x86.h index c2ab1dc217..cc78246ae4 100644 --- a/vidix/sysdep/AsmMacros_x86.h +++ b/vidix/sysdep/AsmMacros_x86.h @@ -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 @@ static __inline__ void intr_enable() #endif -//#endif +//#endif /* ASMMACROS_X86_H */ diff --git a/vidix/unichrome_regs.h b/vidix/unichrome_regs.h index 15795f126b..f9842b5dbc 100644 --- a/vidix/unichrome_regs.h +++ b/vidix/unichrome_regs.h @@ -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 */ |