From 3e9e4acd8dd7b602519a0f5659e6e108efdf31fe Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 2 Jul 2007 22:34:45 +0000 Subject: 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 --- libmpcodecs/ae.h | 4 ++-- libmpcodecs/ae_lame.h | 4 ++-- libmpcodecs/ae_lavc.h | 4 ++-- libmpcodecs/ae_pcm.h | 4 ++-- libmpcodecs/cmmx.h | 4 ++-- libmpcodecs/img_format.h | 4 ++-- libmpcodecs/mp_image.h | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) (limited to 'libmpcodecs') diff --git a/libmpcodecs/ae.h b/libmpcodecs/ae.h index b30aa5e9c6..99899e2e23 100644 --- a/libmpcodecs/ae.h +++ b/libmpcodecs/ae.h @@ -1,6 +1,6 @@ -#ifndef __MPAE_H__ -#define __MPAE_H__ +#ifndef MPAE_H +#define MPAE_H #define ACODEC_COPY 0 #define ACODEC_PCM 1 diff --git a/libmpcodecs/ae_lame.h b/libmpcodecs/ae_lame.h index d77b4a6db2..dc4af5d2c2 100644 --- a/libmpcodecs/ae_lame.h +++ b/libmpcodecs/ae_lame.h @@ -1,5 +1,5 @@ -#ifndef __AE_MP3LAME_H_ -#define __AE_MP3LAME_H_ +#ifndef AE_LAME_H +#define AE_LAME_H #include "ae.h" diff --git a/libmpcodecs/ae_lavc.h b/libmpcodecs/ae_lavc.h index e16fe83534..e7b957fd88 100644 --- a/libmpcodecs/ae_lavc.h +++ b/libmpcodecs/ae_lavc.h @@ -1,5 +1,5 @@ -#ifndef __AE_LAVC_H_ -#define __AE_LAVC_H_ +#ifndef AE_LAVC_H +#define AE_LAVC_H #include "ae.h" diff --git a/libmpcodecs/ae_pcm.h b/libmpcodecs/ae_pcm.h index ab9a9aeb40..ea6bcde1e3 100644 --- a/libmpcodecs/ae_pcm.h +++ b/libmpcodecs/ae_pcm.h @@ -1,5 +1,5 @@ -#ifndef __AE_PCM_H_ -#define __AE_PCM_H_ +#ifndef AE_PCM_H +#define AE_PCM_H #include "ae.h" diff --git a/libmpcodecs/cmmx.h b/libmpcodecs/cmmx.h index 180248a11c..8ee1651309 100644 --- a/libmpcodecs/cmmx.h +++ b/libmpcodecs/cmmx.h @@ -4,8 +4,8 @@ * Author: Zoltan Hidvegi */ -#ifndef __CMMX_H -#define __CMMX_H +#ifndef CMMX_H +#define CMMX_H typedef unsigned long cmmx_t; diff --git a/libmpcodecs/img_format.h b/libmpcodecs/img_format.h index ffe923de7d..b95a4658f2 100644 --- a/libmpcodecs/img_format.h +++ b/libmpcodecs/img_format.h @@ -1,6 +1,6 @@ -#ifndef __IMG_FORMAT_H -#define __IMG_FORMAT_H +#ifndef IMG_FORMAT_H +#define IMG_FORMAT_H /* RGB/BGR Formats */ diff --git a/libmpcodecs/mp_image.h b/libmpcodecs/mp_image.h index eb019a20ee..1a73523f90 100644 --- a/libmpcodecs/mp_image.h +++ b/libmpcodecs/mp_image.h @@ -1,5 +1,5 @@ -#ifndef __MP_IMAGE_H -#define __MP_IMAGE_H 1 +#ifndef MP_IMAGE_H +#define MP_IMAGE_H //--------- codec's requirements (filled by the codec/vf) --------- -- cgit v1.2.3