[MPlayer-cvslog] r26062 - in trunk/vidix: AsmMacros.h cyberblade_regs.h dha.h dhahelperwin/dhahelper.h dhahelperwin/ntverp.h drivers.h fourcc.h glint_regs.h kernelhelper/dhahelper.h mach64.h pm3_regs.h radeon.h savage_regs.h sis_defs.h sis_regs.h sysdep/AsmMacros_alpha.h sysdep/AsmMacros_arm32.h sysdep/AsmMacros_ia64.h sysdep/AsmMacros_powerpc.h sysdep/AsmMacros_sparc.h sysdep/AsmMacros_x86.h unichrome_regs.h vidix.h vidixlib.h
diego
subversion at mplayerhq.hu
Fri Feb 22 18:32:36 CET 2008
Author: diego
Date: Fri Feb 22 18:32:36 2008
New Revision: 26062
Log:
Add MPLAYER_ prefix to multiple inclusion guards.
Modified:
trunk/vidix/AsmMacros.h
trunk/vidix/cyberblade_regs.h
trunk/vidix/dha.h
trunk/vidix/dhahelperwin/dhahelper.h
trunk/vidix/dhahelperwin/ntverp.h
trunk/vidix/drivers.h
trunk/vidix/fourcc.h
trunk/vidix/glint_regs.h
trunk/vidix/kernelhelper/dhahelper.h
trunk/vidix/mach64.h
trunk/vidix/pm3_regs.h
trunk/vidix/radeon.h
trunk/vidix/savage_regs.h
trunk/vidix/sis_defs.h
trunk/vidix/sis_regs.h
trunk/vidix/sysdep/AsmMacros_alpha.h
trunk/vidix/sysdep/AsmMacros_arm32.h
trunk/vidix/sysdep/AsmMacros_ia64.h
trunk/vidix/sysdep/AsmMacros_powerpc.h
trunk/vidix/sysdep/AsmMacros_sparc.h
trunk/vidix/sysdep/AsmMacros_x86.h
trunk/vidix/unichrome_regs.h
trunk/vidix/vidix.h
trunk/vidix/vidixlib.h
Modified: trunk/vidix/AsmMacros.h
==============================================================================
--- trunk/vidix/AsmMacros.h (original)
+++ trunk/vidix/AsmMacros.h Fri Feb 22 18:32:36 2008
@@ -63,8 +63,8 @@
* Modified for readability by Nick Kurshev
*/
-#ifndef ASMMACROS_H
-#define ASMMACROS_H
+#ifndef MPLAYER_ASMMACROS_H
+#define MPLAYER_ASMMACROS_H
#if defined(__GNUC__)
#if defined(__alpha__)
@@ -119,4 +119,4 @@ void outl(U16_t, U32_t);
#endif /* _MINIX and _ACK */
#endif /* __GNUC__ */
-#endif /* ASMMACROS_H */
+#endif /* MPLAYER_ASMMACROS_H */
Modified: trunk/vidix/cyberblade_regs.h
==============================================================================
--- trunk/vidix/cyberblade_regs.h (original)
+++ trunk/vidix/cyberblade_regs.h Fri Feb 22 18:32:36 2008
@@ -23,8 +23,8 @@
*/
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_regs.h,v 1.22 2002/01/11 13:06:30 alanh Exp $ */
-#ifndef CYBERBLADE_REGS_H
-#define CYBERBLADE_REGS_H
+#ifndef MPLAYER_CYBERBLADE_REGS_H
+#define MPLAYER_CYBERBLADE_REGS_H
#define DEBUG 1
@@ -137,4 +137,4 @@
/* --- */
-#endif /* CYBERBLADE_REGS_H */
+#endif /* MPLAYER_CYBERBLADE_REGS_H */
Modified: trunk/vidix/dha.h
==============================================================================
--- trunk/vidix/dha.h (original)
+++ trunk/vidix/dha.h Fri Feb 22 18:32:36 2008
@@ -33,8 +33,8 @@
* Original location: www.linuxvideo.org/gatos
*/
-#ifndef DHA_H
-#define DHA_H
+#ifndef MPLAYER_DHA_H
+#define MPLAYER_DHA_H
#ifdef __cplusplus
extern "C" {
@@ -92,4 +92,4 @@ extern int mtrr_set_type(unsigned base,u
}
#endif
-#endif /* DHA_H */
+#endif /* MPLAYER_DHA_H */
Modified: trunk/vidix/dhahelperwin/dhahelper.h
==============================================================================
--- trunk/vidix/dhahelperwin/dhahelper.h (original)
+++ trunk/vidix/dhahelperwin/dhahelper.h Fri Feb 22 18:32:36 2008
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*****************************************************************************/
-#ifndef DHAHELPER_H
-#define DHAHELPER_H
+#ifndef MPLAYER_DHAHELPER_H
+#define MPLAYER_DHAHELPER_H
// Define the various device type values. Note that values used by Microsoft
// Corporation are in the range 0-32767, and 32768-65535 are reserved for use
@@ -68,4 +68,4 @@ struct __attribute__((__packed__)) dhahe
typedef struct dhahelper_t dhahelper_t;
-#endif /* DHAHELPER_H */
+#endif /* MPLAYER_DHAHELPER_H */
Modified: trunk/vidix/dhahelperwin/ntverp.h
==============================================================================
--- trunk/vidix/dhahelperwin/ntverp.h (original)
+++ trunk/vidix/dhahelperwin/ntverp.h Fri Feb 22 18:32:36 2008
@@ -13,8 +13,8 @@
* PROGRAMMERS: Alex Ionescu (alex.ionescu at reactos.org)
*/
-#ifndef NTVERP_H
-#define NTVERP_H
+#ifndef MPLAYER_NTVERP_H
+#define MPLAYER_NTVERP_H
//
// Windows NT Build 3790.1830
@@ -153,4 +153,4 @@
#define VER_LEGALTRADEMARKS_STR \
"ReactOS(R) is a registered trademark of the ReactOS Foundation."
-#endif /* NTVERP_H */
+#endif /* MPLAYER_NTVERP_H */
Modified: trunk/vidix/drivers.h
==============================================================================
--- trunk/vidix/drivers.h (original)
+++ trunk/vidix/drivers.h Fri Feb 22 18:32:36 2008
@@ -19,12 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef VIDIX_DRIVERS_H
-#define VIDIX_DRIVERS_H
+#ifndef MPLAYER_DRIVERS_H
+#define MPLAYER_DRIVERS_H
void vidix_register_all_drivers (void);
int vidix_find_driver (VDXContext *ctx, const char *name,
unsigned int cap, int verbose);
-#endif /* VIDIX_DRIVERS_H */
+#endif /* MPLAYER_DRIVERS_H */
Modified: trunk/vidix/fourcc.h
==============================================================================
--- trunk/vidix/fourcc.h (original)
+++ trunk/vidix/fourcc.h Fri Feb 22 18:32:36 2008
@@ -22,8 +22,8 @@
* and personally my ideas.
*/
-#ifndef FOURCC_H
-#define FOURCC_H
+#ifndef MPLAYER_FOURCC_H
+#define MPLAYER_FOURCC_H
/* Four-character-code (FOURCC) */
#define vid_fourcc(a,b,c,d)\
@@ -79,4 +79,4 @@
/* Vendor-specific formats */
#define IMGFMT_WNVA vid_fourcc('W','N','V','A') /* Winnov hw compress */
-#endif /* FOURCC_H */
+#endif /* MPLAYER_FOURCC_H */
Modified: trunk/vidix/glint_regs.h
==============================================================================
--- trunk/vidix/glint_regs.h (original)
+++ trunk/vidix/glint_regs.h Fri Feb 22 18:32:36 2008
@@ -14,8 +14,8 @@
*
*/
-#ifndef GLINT_REGS_H
-#define GLINT_REGS_H
+#ifndef MPLAYER_GLINT_REGS_H
+#define MPLAYER_GLINT_REGS_H
/**********************************************
* GLINT 500TX Configuration Region Registers *
@@ -1301,4 +1301,4 @@ do{ \
#define ACCESSCHIP2() \
pGlint->IOOffset = 0x10000;
-#endif /* GLINT_REGS_H */
+#endif /* MPLAYER_GLINT_REGS_H */
Modified: trunk/vidix/kernelhelper/dhahelper.h
==============================================================================
--- trunk/vidix/kernelhelper/dhahelper.h (original)
+++ trunk/vidix/kernelhelper/dhahelper.h Fri Feb 22 18:32:36 2008
@@ -4,8 +4,8 @@
(C) 2002 Alex Beregszaszi <alex at fsn.hu>
*/
-#ifndef DHAHELPER_H
-#define DHAHELPER_H
+#ifndef MPLAYER_DHAHELPER_H
+#define MPLAYER_DHAHELPER_H
#include <linux/ioctl.h>
@@ -66,4 +66,4 @@ typedef struct dhahelper_pci_s
#define DHAHELPER_MTRR _IOWR('D', 3, dhahelper_mtrr_t)
#define DHAHELPER_PCI _IOWR('D', 4, dhahelper_pci_t)
-#endif /* DHAHELPER_H */
+#endif /* MPLAYER_DHAHELPER_H */
Modified: trunk/vidix/mach64.h
==============================================================================
--- trunk/vidix/mach64.h (original)
+++ trunk/vidix/mach64.h Fri Feb 22 18:32:36 2008
@@ -22,8 +22,8 @@
* radeonfb, GATOS (gatos.sf.net) and X11 (www.xfree86.org)
*/
-#ifndef MACH64_H
-#define MACH64_H
+#ifndef MPLAYER_MACH64_H
+#define MPLAYER_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 suppo
#define MIX_FN_PAINT MIX_SRC
-#endif /* MACH64_H */
+#endif /* MPLAYER_MACH64_H */
Modified: trunk/vidix/pm3_regs.h
==============================================================================
--- trunk/vidix/pm3_regs.h (original)
+++ trunk/vidix/pm3_regs.h Fri Feb 22 18:32:36 2008
@@ -11,8 +11,8 @@
*
*/
-#ifndef PM3_REGS_H
-#define PM3_REGS_H
+#ifndef MPLAYER_PM3_REGS_H
+#define MPLAYER_PM3_REGS_H
/**********************************************
* GLINT Permedia3 Control Status registers *
@@ -1110,4 +1110,4 @@ do{ \
temp = READ_REG(PM3RD_IndexedData); \
}
#endif
-#endif /* PM3_REGS_H */
+#endif /* MPLAYER_PM3_REGS_H */
Modified: trunk/vidix/radeon.h
==============================================================================
--- trunk/vidix/radeon.h (original)
+++ trunk/vidix/radeon.h Fri Feb 22 18:32:36 2008
@@ -22,8 +22,8 @@
* and partly compatible with Rage128 set (in OV0, CAP0, CAP1 parts)
*/
-#ifndef RADEON_H
-#define RADEON_H
+#ifndef MPLAYER_RADEON_H
+#define MPLAYER_RADEON_H
#define RADEON_REGSIZE 0x4000
#define MM_INDEX 0x0000
@@ -2235,4 +2235,4 @@
/* End of field default values. */
-#endif /* RADEON_H */
+#endif /* MPLAYER_RADEON_H */
Modified: trunk/vidix/savage_regs.h
==============================================================================
--- trunk/vidix/savage_regs.h (original)
+++ trunk/vidix/savage_regs.h Fri Feb 22 18:32:36 2008
@@ -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 MPLAYER_SAVAGE_REGS_H
+#define MPLAYER_SAVAGE_REGS_H
#define S3_SAVAGE3D_SERIES(chip) ((chip>=S3_SAVAGE3D) && (chip<=S3_SAVAGE_MX))
@@ -276,4 +276,4 @@ do {
& VSCALING_Mask)
-#endif /* SAVAGE_REGS_H */
+#endif /* MPLAYER_SAVAGE_REGS_H */
Modified: trunk/vidix/sis_defs.h
==============================================================================
--- trunk/vidix/sis_defs.h (original)
+++ trunk/vidix/sis_defs.h Fri Feb 22 18:32:36 2008
@@ -21,8 +21,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef VIDIX_SIS_DEFS_H
-#define VIDIX_SIS_DEFS_H
+#ifndef MPLAYER_SIS_DEFS_H
+#define MPLAYER_SIS_DEFS_H
/** PCI IDs **/
#define VENDOR_SIS 0x1039
@@ -104,4 +104,4 @@ extern unsigned int sis_detected_crt2_de
extern unsigned int sis_force_crt2_type;
extern int sis_device_id;
-#endif /* VIDIX_SIS_DEFS_H */
+#endif /* MPLAYER_SIS_DEFS_H */
Modified: trunk/vidix/sis_regs.h
==============================================================================
--- trunk/vidix/sis_regs.h (original)
+++ trunk/vidix/sis_regs.h Fri Feb 22 18:32:36 2008
@@ -21,8 +21,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef VIDIX_SIS_REGS_H
-#define VIDIX_SIS_REGS_H
+#ifndef MPLAYER_SIS_REGS_H
+#define MPLAYER_SIS_REGS_H
#define inSISREG(base) INPORT8(base)
#define outSISREG(base,val) OUTPORT8(base, val)
@@ -410,4 +410,4 @@
/* Not public (yet?) */
-#endif /* VIDIX_SIS_REGS_H */
+#endif /* MPLAYER_SIS_REGS_H */
Modified: trunk/vidix/sysdep/AsmMacros_alpha.h
==============================================================================
--- trunk/vidix/sysdep/AsmMacros_alpha.h (original)
+++ trunk/vidix/sysdep/AsmMacros_alpha.h Fri Feb 22 18:32:36 2008
@@ -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 */
Modified: trunk/vidix/sysdep/AsmMacros_arm32.h
==============================================================================
--- trunk/vidix/sysdep/AsmMacros_arm32.h (original)
+++ trunk/vidix/sysdep/AsmMacros_arm32.h Fri Feb 22 18:32:36 2008
@@ -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
#define intr_disable()
#define intr_enable()
-#endif /* ASMMACROS_ARM32_H */
+#endif /* MPLAYER_ASMMACROS_ARM32_H */
Modified: trunk/vidix/sysdep/AsmMacros_ia64.h
==============================================================================
--- trunk/vidix/sysdep/AsmMacros_ia64.h (original)
+++ trunk/vidix/sysdep/AsmMacros_ia64.h Fri Feb 22 18:32:36 2008
@@ -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 */
Modified: trunk/vidix/sysdep/AsmMacros_powerpc.h
==============================================================================
--- trunk/vidix/sysdep/AsmMacros_powerpc.h (original)
+++ trunk/vidix/sysdep/AsmMacros_powerpc.h Fri Feb 22 18:32:36 2008
@@ -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(shor
#endif
-#endif /* ASMMACROS_POWERPC_H */
+#endif /* MPLAYER_ASMMACROS_POWERPC_H */
Modified: trunk/vidix/sysdep/AsmMacros_sparc.h
==============================================================================
--- trunk/vidix/sysdep/AsmMacros_sparc.h (original)
+++ trunk/vidix/sysdep/AsmMacros_sparc.h Fri Feb 22 18:32:36 2008
@@ -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(unsig
#define intr_disable()
#define intr_enable()
-#endif /* ASMMACROS_SPARC_H */
+#endif /* MPLAYER_ASMMACROS_SPARC_H */
Modified: trunk/vidix/sysdep/AsmMacros_x86.h
==============================================================================
--- trunk/vidix/sysdep/AsmMacros_x86.h (original)
+++ trunk/vidix/sysdep/AsmMacros_x86.h Fri Feb 22 18:32:36 2008
@@ -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 */
Modified: trunk/vidix/unichrome_regs.h
==============================================================================
--- trunk/vidix/unichrome_regs.h (original)
+++ trunk/vidix/unichrome_regs.h Fri Feb 22 18:32:36 2008
@@ -23,8 +23,8 @@
* DEALINGS IN THE SOFTWARE.
*/
-#ifndef UNICHROME_REGS_H
-#define UNICHROME_REGS_H
+#ifndef MPLAYER_UNICHROME_REGS_H
+#define MPLAYER_UNICHROME_REGS_H
/* Video status flag */
@@ -632,4 +632,4 @@
-#endif /* UNICHROME_REGS_H */
+#endif /* MPLAYER_UNICHROME_REGS_H */
Modified: trunk/vidix/vidix.h
==============================================================================
--- trunk/vidix/vidix.h (original)
+++ trunk/vidix/vidix.h Fri Feb 22 18:32:36 2008
@@ -32,8 +32,8 @@
* NOTE: This interface is introduces as driver interface.
*/
-#ifndef VIDIX_H
-#define VIDIX_H
+#ifndef MPLAYER_VIDIX_H
+#define MPLAYER_VIDIX_H
#ifdef __cplusplus
extern "C" {
@@ -314,4 +314,4 @@ typedef struct vidix_oem_fx_s
}
#endif
-#endif /* VIDIX_H */
+#endif /* MPLAYER_VIDIX_H */
Modified: trunk/vidix/vidixlib.h
==============================================================================
--- trunk/vidix/vidixlib.h (original)
+++ trunk/vidix/vidixlib.h Fri Feb 22 18:32:36 2008
@@ -32,8 +32,8 @@
* NOTE: This interface is introduces as driver interface.
*/
-#ifndef VIDIXLIB_H
-#define VIDIXLIB_H
+#ifndef MPLAYER_VIDIXLIB_H
+#define MPLAYER_VIDIXLIB_H
#ifdef __cplusplus
extern "C" {
@@ -141,4 +141,4 @@ int vdlPlaybackCopyFrame(VDL_HANDLE, c
}
#endif
-#endif /* VIDIXLIB_H */
+#endif /* MPLAYER_VIDIXLIB_H */
More information about the MPlayer-cvslog
mailing list