Do not use leading underscores in multiple inclusion guards, they are reserved.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23709 b3059339-0415-0410-9bf9-f77b7e298cf2

12 files changed, 26 insertions, 26 deletions

diff --git a/libvo/aspect.h b/libvo/aspect.h
index e23b3445cf..de0a182397 100644
--- a/libvo/aspect.h
+++ b/libvo/aspect.h
@@ -1,5 +1,5 @@
-#ifndef __ASPECT_H
-#define __ASPECT_H
+#ifndef ASPECT_H
+#define ASPECT_H
 /* Stuff for correct aspect scaling. */
 
 extern int vo_panscan_x;
diff --git a/libvo/fastmemcpy.h b/libvo/fastmemcpy.h
index 582cdec851..a379a6f4bc 100644
--- a/libvo/fastmemcpy.h
+++ b/libvo/fastmemcpy.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef __FASTMEMCPY_H
-#define __FASTMEMCPY_H
+#ifndef FASTMEMCPY_H
+#define FASTMEMCPY_H
 
 #include "config.h"
 #include <inttypes.h>
diff --git a/libvo/font_load.h b/libvo/font_load.h
index db427473d7..39242eab38 100644
--- a/libvo/font_load.h
+++ b/libvo/font_load.h
@@ -1,5 +1,5 @@
-#ifndef __MPLAYER_FONT_LOAD_H
-#define __MPLAYER_FONT_LOAD_H
+#ifndef MPLAYER_FONT_LOAD_H
+#define MPLAYER_FONT_LOAD_H
 
 #ifdef HAVE_FREETYPE
 #include <ft2build.h>
@@ -102,4 +102,4 @@ static int kerning(font_desc_t *desc, int prevc, int c) { return 0; }
 raw_file* load_raw(char *name,int verbose);
 font_desc_t* read_font_desc(const char* fname,float factor,int verbose);
 
-#endif /* ! __MPLAYER_FONT_LOAD_H */
+#endif /* ! MPLAYER_FONT_LOAD_H */
diff --git a/libvo/geometry.h b/libvo/geometry.h
index fae10fc508..261ae4d64b 100644
--- a/libvo/geometry.h
+++ b/libvo/geometry.h
@@ -1,9 +1,9 @@
 /* This file (C) Mark Zealey <mark@zealos.org 2002, released under GPL */
-#ifndef __GEOMETRY_H
-#define __GEOMETRY_H
+#ifndef GEOMETRY_H
+#define GEOMETRY_H
 
 extern char *vo_geometry;
 extern int geometry_wh_changed;
 extern int geometry_xy_changed;
 int geometry(int *xpos, int *ypos, int *widw, int *widh, int scrw, int scrh);
-#endif /* !__GEOMETRY_H */
+#endif /* !GEOMETRY_H */
diff --git a/libvo/gl_common.h b/libvo/gl_common.h
index 927e887c6b..53ee8ef08d 100644
--- a/libvo/gl_common.h
+++ b/libvo/gl_common.h
@@ -1,5 +1,5 @@
-#ifndef __GL_COMMON_H__
-#define __GL_COMMON_H__
+#ifndef GL_COMMON_H
+#define GL_COMMON_H
 
 #include "mp_msg.h"
 #include "config.h"
diff --git a/libvo/gtf.h b/libvo/gtf.h
index 1cedd1c3ef..aa51dc97a0 100644
--- a/libvo/gtf.h
+++ b/libvo/gtf.h
@@ -1,5 +1,5 @@
-#ifndef __GTF_H
-#define __GTF_H
+#ifndef GTF_H
+#define GTF_H
 
 #include <vbe.h>
 
diff --git a/libvo/osd.h b/libvo/osd.h
index 36ff2e68d3..d1a744ad3b 100644
--- a/libvo/osd.h
+++ b/libvo/osd.h
@@ -1,6 +1,6 @@
 
-#ifndef __MPLAYER_OSD_H
-#define __MPLAYER_OSD_H
+#ifndef MPLAYER_OSD_H
+#define MPLAYER_OSD_H
 
 // Generic alpha renderers for all YUV modes and RGB depths.
 // These are "reference implementations", should be optimized later (MMX, etc)
diff --git a/libvo/sub.h b/libvo/sub.h
index 3d36f1bb2d..e139607e21 100644
--- a/libvo/sub.h
+++ b/libvo/sub.h
@@ -1,6 +1,6 @@
 
-#ifndef __MPLAYER_SUB_H
-#define __MPLAYER_SUB_H
+#ifndef MPLAYER_SUB_H
+#define MPLAYER_SUB_H
 
 typedef struct mp_osd_bbox_s {
     int x1,y1,x2,y2;
diff --git a/libvo/vesa_lvo.h b/libvo/vesa_lvo.h
index 7ef6e4aead..22991bd02b 100644
--- a/libvo/vesa_lvo.h
+++ b/libvo/vesa_lvo.h
@@ -9,8 +9,8 @@
  * This file contains vo_vesa interface to Linux Video Overlay.
  */
 
-#ifndef __VESA_LVO_H
-#define __VESA_LVO_H
+#ifndef VESA_LVO_H
+#define VESA_LVO_H
 
 int	 vlvo_preinit(const char *drvname);
 int      vlvo_init(unsigned src_width,unsigned src_height,
diff --git a/libvo/video_out.h b/libvo/video_out.h
index d8515665de..eb1e6fe13f 100644
--- a/libvo/video_out.h
+++ b/libvo/video_out.h
@@ -7,8 +7,8 @@
  *
  */
  
-#ifndef __VIDEO_OUT_H
-#define __VIDEO_OUT_H 1
+#ifndef VIDEO_OUT_H
+#define VIDEO_OUT_H
 
 #include <inttypes.h>
 #include <stdarg.h>
diff --git a/libvo/vosub_vidix.h b/libvo/vosub_vidix.h
index d129995675..022605cb92 100644
--- a/libvo/vosub_vidix.h
+++ b/libvo/vosub_vidix.h
@@ -9,8 +9,8 @@
  * This file contains vosub_vidix interface to any mplayer's VO driver
  */
 
-#ifndef __VOSUB_VIDIX_H
-#define __VOSUB_VIDIX_H
+#ifndef VOSUB_VIDIX_H
+#define VOSUB_VIDIX_H
 
 		    /* drvname can be NULL */
 int	 vidix_preinit(const char *drvname,void *server);
diff --git a/libvo/wskeys.h b/libvo/wskeys.h
index 6c2c5db264..65dd06541d 100644
--- a/libvo/wskeys.h
+++ b/libvo/wskeys.h
@@ -1,6 +1,6 @@
 
-#ifndef _WSKEYS_H
-#define _WSKEYS_H
+#ifndef WSKEYS_H
+#define WSKEYS_H
 
 #define wsosbrackets '['
 #define wscsbrackets ']'