diff options
Diffstat (limited to 'vidix/sysdep')
-rw-r--r-- | vidix/sysdep/AsmMacros_alpha.h | 7 | ||||
-rw-r--r-- | vidix/sysdep/AsmMacros_arm32.h | 7 | ||||
-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 |
6 files changed, 20 insertions, 18 deletions
diff --git a/vidix/sysdep/AsmMacros_alpha.h b/vidix/sysdep/AsmMacros_alpha.h index 2d018971f7..e2e3751629 100644 --- a/vidix/sysdep/AsmMacros_alpha.h +++ b/vidix/sysdep/AsmMacros_alpha.h @@ -59,8 +59,9 @@ * advised of the possibility of such damage. */ -#ifndef ASMMACROS_ALPHA_H -#define ASMMACROS_ALPHA_H +#ifndef MPLAYER_ASMMACROS_ALPHA_H +#define MPLAYER_ASMMACROS_ALPHA_H + #if defined (linux) #include <sys/io.h> #elif defined (__FreeBSD__) @@ -78,4 +79,4 @@ extern u_int32_t inl(u_int32_t port); #define intr_disable() #define intr_enable() -#endif /* ASMMACROS_ALPHA_H */ +#endif /* MPLAYER_ASMMACROS_ALPHA_H */ diff --git a/vidix/sysdep/AsmMacros_arm32.h b/vidix/sysdep/AsmMacros_arm32.h index 003c2788cb..6fe0b66466 100644 --- a/vidix/sysdep/AsmMacros_arm32.h +++ b/vidix/sysdep/AsmMacros_arm32.h @@ -59,8 +59,9 @@ * advised of the possibility of such damage. */ -#ifndef ASMMACROS_ARM32_H -#define ASMMACROS_ARM32_H +#ifndef MPLAYER_ASMMACROS_ARM32_H +#define MPLAYER_ASMMACROS_ARM32_H + unsigned int IOPortBase; /* Memory mapped I/O port area */ static __inline__ void outb(short port,char val) @@ -102,4 +103,4 @@ static __inline__ unsigned int inl(short port) #define intr_disable() #define intr_enable() -#endif /* ASMMACROS_ARM32_H */ +#endif /* MPLAYER_ASMMACROS_ARM32_H */ diff --git a/vidix/sysdep/AsmMacros_ia64.h b/vidix/sysdep/AsmMacros_ia64.h index a1fe8c975c..0e2dc19024 100644 --- a/vidix/sysdep/AsmMacros_ia64.h +++ b/vidix/sysdep/AsmMacros_ia64.h @@ -59,8 +59,8 @@ * advised of the possibility of such damage. */ -#ifndef ASMMACROS_IA64_H -#define ASMMACROS_IA64_H +#ifndef MPLAYER_ASMMACROS_IA64_H +#define MPLAYER_ASMMACROS_IA64_H #if defined(linux) #include <sys/io.h> @@ -68,4 +68,4 @@ #error This stuff is not ported on your system #endif -#endif /* ASMMACROS_IA64_H */ +#endif /* MPLAYER_ASMMACROS_IA64_H */ diff --git a/vidix/sysdep/AsmMacros_powerpc.h b/vidix/sysdep/AsmMacros_powerpc.h index 5dd5143cf3..71ab4c6617 100644 --- a/vidix/sysdep/AsmMacros_powerpc.h +++ b/vidix/sysdep/AsmMacros_powerpc.h @@ -59,8 +59,8 @@ * advised of the possibility of such damage. */ -#ifndef ASMMACROS_POWERPC_H -#define ASMMACROS_POWERPC_H +#ifndef MPLAYER_ASMMACROS_POWERPC_H +#define MPLAYER_ASMMACROS_POWERPC_H #if defined(Lynx) || defined(__OpenBSD__) @@ -112,4 +112,4 @@ static __inline__ unsigned long inl(short port) #endif -#endif /* ASMMACROS_POWERPC_H */ +#endif /* MPLAYER_ASMMACROS_POWERPC_H */ diff --git a/vidix/sysdep/AsmMacros_sparc.h b/vidix/sysdep/AsmMacros_sparc.h index aeef9750e4..2358adea6f 100644 --- a/vidix/sysdep/AsmMacros_sparc.h +++ b/vidix/sysdep/AsmMacros_sparc.h @@ -59,8 +59,8 @@ * advised of the possibility of such damage. */ -#ifndef ASMMACROS_SPARC_H -#define ASMMACROS_SPARC_H +#ifndef MPLAYER_ASMMACROS_SPARC_H +#define MPLAYER_ASMMACROS_SPARC_H #ifndef ASI_PL #define ASI_PL 0x88 @@ -105,4 +105,4 @@ static __inline__ unsigned int inl(unsigned long port) #define intr_disable() #define intr_enable() -#endif /* ASMMACROS_SPARC_H */ +#endif /* MPLAYER_ASMMACROS_SPARC_H */ diff --git a/vidix/sysdep/AsmMacros_x86.h b/vidix/sysdep/AsmMacros_x86.h index fb717ab5f2..c28b8e5b26 100644 --- a/vidix/sysdep/AsmMacros_x86.h +++ b/vidix/sysdep/AsmMacros_x86.h @@ -59,8 +59,8 @@ * advised of the possibility of such damage. */ -#ifndef ASMMACROS_X86_H -#define ASMMACROS_X86_H +#ifndef MPLAYER_ASMMACROS_X86_H +#define MPLAYER_ASMMACROS_X86_H //#if defined (WINNT) //#error This stuff is not ported on your system @@ -345,4 +345,4 @@ static __inline__ void intr_enable() //#endif -#endif /* ASMMACROS_X86_H */ +#endif /* MPLAYER_ASMMACROS_X86_H */ |