From 437e32353f50cd6bd5acdaeb60f47cfebc9ff87d Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 2 Jul 2007 21:34:39 +0000
Subject: [PATCH] Consistently use filename as multiple inclusion guard.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23707 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libass/ass_mp.h       | 4 ++--
 libmpdemux/ms_hdr.h   | 4 ++--
 libmpdemux/stheader.h | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libass/ass_mp.h b/libass/ass_mp.h
index 7f98840d58..5439a76001 100644
--- a/libass/ass_mp.h
+++ b/libass/ass_mp.h
@@ -18,8 +18,8 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-#ifndef __ASS_OPTIONS_H__
-#define __ASS_OPTIONS_H__
+#ifndef __ASS_MP_H__
+#define __ASS_MP_H__
 
 #include "subreader.h"
 
diff --git a/libmpdemux/ms_hdr.h b/libmpdemux/ms_hdr.h
index 153f1ad361..90ee7e82e5 100644
--- a/libmpdemux/ms_hdr.h
+++ b/libmpdemux/ms_hdr.h
@@ -1,5 +1,5 @@
-#ifndef __MS_HEADER_H
-#define __MS_HEADER_H 1
+#ifndef __MS_HDR_H
+#define __MS_HDR_H
 
 #ifndef _WAVEFORMATEX_
 #define _WAVEFORMATEX_
diff --git a/libmpdemux/stheader.h b/libmpdemux/stheader.h
index fc57100625..8c1a05e46d 100644
--- a/libmpdemux/stheader.h
+++ b/libmpdemux/stheader.h
@@ -1,5 +1,5 @@
-#ifndef __ST_HEADER_H
-#define __ST_HEADER_H 1
+#ifndef __STHEADER_H__
+#define __STHEADER_H__
 
 #include "aviheader.h"
 #include "ms_hdr.h"