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

15 files changed, 42 insertions, 42 deletions

diff --git a/libmpdemux/asf.h b/libmpdemux/asf.h
index 7dbc900bca..2252953755 100644
--- a/libmpdemux/asf.h
+++ b/libmpdemux/asf.h
@@ -1,5 +1,5 @@
-#ifndef __ASF_H
-#define __ASF_H
+#ifndef ASF_H
+#define ASF_H
 
 //#include "config.h"	/* for WORDS_BIGENDIAN */
 #include <inttypes.h>
diff --git a/libmpdemux/aviheader.h b/libmpdemux/aviheader.h
index e47356c97b..ef75a6c7df 100644
--- a/libmpdemux/aviheader.h
+++ b/libmpdemux/aviheader.h
@@ -1,5 +1,5 @@
-#ifndef _aviheader_h
-#define	_aviheader_h
+#ifndef AVIHEADER_H
+#define AVIHEADER_H
 
 //#include "config.h"	/* get correct definition WORDS_BIGENDIAN */
 #include "libavutil/common.h"
diff --git a/libmpdemux/demux_rtp.h b/libmpdemux/demux_rtp.h
index 8d8277bad0..cffd3d9d85 100644
--- a/libmpdemux/demux_rtp.h
+++ b/libmpdemux/demux_rtp.h
@@ -1,13 +1,13 @@
-#ifndef _DEMUX_RTP_H
-#define _DEMUX_RTP_H
+#ifndef DEMUX_RTP_H
+#define DEMUX_RTP_H
 
 #include <stdlib.h>
 #include <stdio.h>
 
-#ifndef __STREAM_H
+#ifndef STREAM_H
 #include "stream/stream.h"
 #endif
-#ifndef __DEMUXER_H
+#ifndef DEMUXER_H
 #include "demuxer.h"
 #endif
 
diff --git a/libmpdemux/demux_rtp_internal.h b/libmpdemux/demux_rtp_internal.h
index 4602da3a86..321e9f09e9 100644
--- a/libmpdemux/demux_rtp_internal.h
+++ b/libmpdemux/demux_rtp_internal.h
@@ -1,13 +1,13 @@
-#ifndef _DEMUX_RTP_INTERNAL_H
-#define _DEMUX_RTP_INTERNAL_H
+#ifndef DEMUX_RTP_INTERNAL_H
+#define DEMUX_RTP_INTERNAL_H
 
 #include <stdlib.h>
 
 extern "C" {
-#ifndef __STREAM_H
+#ifndef STREAM_H
 #include "stream/stream.h"
 #endif
-#ifndef __DEMUXER_H
+#ifndef DEMUXER_H
 #include "demuxer.h"
 #endif
 #ifdef USE_LIBAVCODEC_SO
diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h
index 73b6bc5194..ecba6b71ca 100644
--- a/libmpdemux/demuxer.h
+++ b/libmpdemux/demuxer.h
@@ -1,5 +1,5 @@
-#ifndef __DEMUXER_H
-#define __DEMUXER_H 1
+#ifndef DEMUXER_H
+#define DEMUXER_H
 
 #ifdef USE_ASS
 #include "libass/ass_types.h"
@@ -387,4 +387,4 @@ int demuxer_add_chapter(demuxer_t* demuxer, const char* name, uint64_t start, ui
 int demuxer_seek_chapter(demuxer_t *demuxer, int chapter, int mode, float *seek_pts, int *num_chapters, char **chapter_name);
 
 
-#endif /* __DEMUXER_H */
+#endif /* DEMUXER_H */
diff --git a/libmpdemux/ebml.h b/libmpdemux/ebml.h
index 6f32d73c49..967bffa118 100644
--- a/libmpdemux/ebml.h
+++ b/libmpdemux/ebml.h
@@ -1,5 +1,5 @@
-#ifndef __EBML_H
-#define __EBML_H
+#ifndef EBML_H
+#define EBML_H
 
 #include <inttypes.h>
 
@@ -188,4 +188,4 @@ int ebml_read_skip (stream_t *s, uint64_t *length);
 uint32_t ebml_read_master (stream_t *s, uint64_t *length);
 char *ebml_read_header (stream_t *s, int *version);
 
-#endif /* __EBML_H */
+#endif /* EBML_H */
diff --git a/libmpdemux/genres.h b/libmpdemux/genres.h
index 45c43d9ecf..3548c26180 100644
--- a/libmpdemux/genres.h
+++ b/libmpdemux/genres.h
@@ -14,8 +14,8 @@
  */
 
 
-#ifndef _GENRES_H
-#define _GENRES_H
+#ifndef GENRES_H
+#define GENRES_H
 
 
 char *genres[] = {
@@ -278,4 +278,4 @@ char *genres[] = {
 };
 
 
-#endif /* _GENRES_H */
+#endif /* GENRES_H */
diff --git a/libmpdemux/matroska.h b/libmpdemux/matroska.h
index e88faad275..0367925ec8 100644
--- a/libmpdemux/matroska.h
+++ b/libmpdemux/matroska.h
@@ -4,8 +4,8 @@
  * see http://cvs.corecodec.org/cgi-bin/cvsweb.cgi/~checkout~/matroska/doc/website/specs/codex.html?rev=HEAD&content-type=text/html
  */
 
-#ifndef __MATROSKA_H
-#define __MATROSKA_H
+#ifndef MATROSKA_H
+#define MATROSKA_H
 
 #define MKV_A_AAC_2MAIN  "A_AAC/MPEG2/MAIN"
 #define MKV_A_AAC_2LC    "A_AAC/MPEG2/LC"
@@ -66,4 +66,4 @@ void demux_mkv_get_audio_lang(demuxer_t *demuxer, int track_num, char *lang,
 void demux_mkv_get_sub_lang(demuxer_t *demuxer, int track_num, char *lang,
                             int maxlen);
 
-#endif /* __MATROSKA_H */
+#endif /* MATROSKA_H */
diff --git a/libmpdemux/mf.h b/libmpdemux/mf.h
index b288063a28..6022ee12b9 100644
--- a/libmpdemux/mf.h
+++ b/libmpdemux/mf.h
@@ -1,6 +1,6 @@
 
-#ifndef _MF_H
-#define _MF_H
+#ifndef MF_H
+#define MF_H
 
 extern int    mf_w;
 extern int    mf_h;
diff --git a/libmpdemux/mpeg_packetizer.h b/libmpdemux/mpeg_packetizer.h
index 969c2f1133..6a17034f1f 100644
--- a/libmpdemux/mpeg_packetizer.h
+++ b/libmpdemux/mpeg_packetizer.h
@@ -22,8 +22,8 @@
  *  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef _MPEG_PACKETIZER_H_
-#define _MPEG_PACKETIZER_H_
+#ifndef MPEG_PACKETIZER_H
+#define MPEG_PACKETIZER_H
 
 /* Send MPEG <type> PES packet */
 int send_mpeg_pes_packet (unsigned char *data, int len, int id, uint64_t pts, 
@@ -38,4 +38,4 @@ int send_mpeg_lpcm_packet (unsigned char *data, int len,
                            int id, uint64_t pts, int freq_id,
                            int my_write (unsigned char *data, int len));
 
-#endif /* _MPEG_PACKETIZER_H_ */
+#endif /* MPEG_PACKETIZER_H */
diff --git a/libmpdemux/ms_hdr.h b/libmpdemux/ms_hdr.h
index 90ee7e82e5..3ca0179ddc 100644
--- a/libmpdemux/ms_hdr.h
+++ b/libmpdemux/ms_hdr.h
@@ -1,5 +1,5 @@
-#ifndef __MS_HDR_H
-#define __MS_HDR_H
+#ifndef MS_HDR_H
+#define MS_HDR_H
 
 #ifndef _WAVEFORMATEX_
 #define _WAVEFORMATEX_
diff --git a/libmpdemux/parse_mp4.h b/libmpdemux/parse_mp4.h
index 5fbb3422e3..6bd404c51b 100644
--- a/libmpdemux/parse_mp4.h
+++ b/libmpdemux/parse_mp4.h
@@ -4,8 +4,8 @@
  * File licensed under the GPL, see http://www.fsf.org/ for more info.
  */
 
-#ifndef __PARSE_MP4_H
-#define __PARSE_MP4_H 1
+#ifndef PARSE_MP4_H
+#define PARSE_MP4_H
 
 #include <inttypes.h>
 
@@ -107,5 +107,5 @@ typedef struct {
 int mp4_parse_esds(unsigned char *data, int datalen, esds_t *esds);
 void mp4_free_esds(esds_t *esds); 
 
-#endif /* !__PARSE_MP4_H */
+#endif /* !PARSE_MP4_H */
 
diff --git a/libmpdemux/stheader.h b/libmpdemux/stheader.h
index 8c1a05e46d..3bd3725f1f 100644
--- a/libmpdemux/stheader.h
+++ b/libmpdemux/stheader.h
@@ -1,5 +1,5 @@
-#ifndef __STHEADER_H__
-#define __STHEADER_H__
+#ifndef STHEADER_H
+#define STHEADER_H
 
 #include "aviheader.h"
 #include "ms_hdr.h"
diff --git a/libmpdemux/yuv4mpeg.h b/libmpdemux/yuv4mpeg.h
index 12e1249bc0..2db6136ce1 100644
--- a/libmpdemux/yuv4mpeg.h
+++ b/libmpdemux/yuv4mpeg.h
@@ -24,8 +24,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef __YUV4MPEG_H__
-#define __YUV4MPEG_H__
+#ifndef YUV4MPEG_H
+#define YUV4MPEG_H
 
 #include <stdlib.h>
 //#include "mp_msg.h"
@@ -449,6 +449,6 @@ int y4m_allow_unknown_tags(int yn);
  ************************************************************************
  ************************************************************************/
 
-#endif /* __YUV4MPEG_H__ */
+#endif /* YUV4MPEG_H */
 
 
diff --git a/libmpdemux/yuv4mpeg_intern.h b/libmpdemux/yuv4mpeg_intern.h
index 0291e3a2bf..edf447509e 100644
--- a/libmpdemux/yuv4mpeg_intern.h
+++ b/libmpdemux/yuv4mpeg_intern.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef __YUV4MPEG_INTERN_H__
-#define __YUV4MPEG_INTERN_H__
+#ifndef YUV4MPEG_INTERN_H
+#define YUV4MPEG_INTERN_H
 
 
 #define Y4M_MAGIC "YUV4MPEG2"
@@ -75,4 +75,4 @@
 #define Y4M_DAR_MPEG2_3 { 16, 9 }
 #define Y4M_DAR_MPEG2_4 { 221, 100 }
 
-#endif /* __YUV4MPEG_INTERN_H__ */
+#endif /* YUV4MPEG_INTERN_H */