# HG changeset patch # User diego # Date 1183411422 0 # Node ID e26d1367fa1d4cd96e8f0f73c0caa7efe58e73f5 # Parent f15bce7943b9effd4065e977c92fc269e894a5de Consistently use filenames as multiple inclusion guards. diff -r f15bce7943b9 -r e26d1367fa1d libvo/fastmemcpy.h --- a/libvo/fastmemcpy.h Mon Jul 02 20:55:05 2007 +0000 +++ b/libvo/fastmemcpy.h Mon Jul 02 21:23:42 2007 +0000 @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __MPLAYER_MEMCPY -#define __MPLAYER_MEMCPY 1 +#ifndef __FASTMEMCPY_H +#define __FASTMEMCPY_H #include "config.h" #include diff -r f15bce7943b9 -r e26d1367fa1d libvo/vesa_lvo.h --- a/libvo/vesa_lvo.h Mon Jul 02 20:55:05 2007 +0000 +++ b/libvo/vesa_lvo.h Mon Jul 02 21:23:42 2007 +0000 @@ -9,8 +9,8 @@ * This file contains vo_vesa interface to Linux Video Overlay. */ -#ifndef __VESA_LVO_INCLUDED -#define __VESA_LVO_INCLUDED +#ifndef __VESA_LVO_H +#define __VESA_LVO_H int vlvo_preinit(const char *drvname); int vlvo_init(unsigned src_width,unsigned src_height, diff -r f15bce7943b9 -r e26d1367fa1d libvo/vosub_vidix.h --- a/libvo/vosub_vidix.h Mon Jul 02 20:55:05 2007 +0000 +++ b/libvo/vosub_vidix.h Mon Jul 02 21:23:42 2007 +0000 @@ -9,8 +9,8 @@ * This file contains vosub_vidix interface to any mplayer's VO driver */ -#ifndef __VOSUB_VIDIX_INCLUDED -#define __VOSUB_VIDIX_INCLUDED +#ifndef __VOSUB_VIDIX_H +#define __VOSUB_VIDIX_H /* drvname can be NULL */ int vidix_preinit(const char *drvname,void *server); diff -r f15bce7943b9 -r e26d1367fa1d libvo/wskeys.h --- a/libvo/wskeys.h Mon Jul 02 20:55:05 2007 +0000 +++ b/libvo/wskeys.h Mon Jul 02 21:23:42 2007 +0000 @@ -1,6 +1,6 @@ -#ifndef _MY_WSKEY -#define _MY_WSKEY +#ifndef _WSKEYS_H +#define _WSKEYS_H #define wsosbrackets '[' #define wscsbrackets ']'