From fe9ec3ffdd77e6ceb397d6823d4e3b5c00e0ea0a Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 28 Jan 2008 01:32:52 +0000 Subject: Consistently use uppercase filename as multiple inclusion guard. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25897 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libass/mputils.h | 6 +++--- libmpcodecs/ae.h | 6 +++--- libmpcodecs/ae_faac.h | 6 +++--- libmpcodecs/ae_toolame.h | 6 +++--- libmpcodecs/ae_twolame.h | 6 +++--- libmpcodecs/mpc_info.h | 6 +++--- libmpcodecs/native/mmx.h | 6 +++--- libmpcodecs/vqf.h | 6 +++--- libmpdemux/demux_xmms_plugin.h | 6 +++--- libvo/font_load.h | 6 +++--- loader/ext.h | 6 +++--- stream/librtsp/rtsp.h | 6 +++--- stream/librtsp/rtsp_rtp.h | 6 +++--- stream/pnm.h | 6 +++--- stream/realrtsp/asmrp.h | 6 +++--- stream/realrtsp/xbuffer.h | 6 +++--- vidix/dha.h | 6 +++--- 17 files changed, 51 insertions(+), 51 deletions(-) diff --git a/libass/mputils.h b/libass/mputils.h index 50c52cb0e0..1814af633e 100644 --- a/libass/mputils.h +++ b/libass/mputils.h @@ -1,5 +1,5 @@ -#ifndef ASS_MPUTILS_H -#define ASS_MPUTILS_H +#ifndef MPUTILS_H +#define MPUTILS_H #include "mp_msg.h" #include "help_mp.h" @@ -8,4 +8,4 @@ #include "libvo/sub.h" // for utf8_get_char #include "libavutil/common.h" -#endif /* ASS_MPUTILS_H */ +#endif /* MPUTILS_H */ diff --git a/libmpcodecs/ae.h b/libmpcodecs/ae.h index 5e4dbdfaa8..d92d56f513 100644 --- a/libmpcodecs/ae.h +++ b/libmpcodecs/ae.h @@ -1,6 +1,6 @@ -#ifndef MPAE_H -#define MPAE_H +#ifndef AE_H +#define AE_H #define ACODEC_COPY 0 #define ACODEC_PCM 1 @@ -43,4 +43,4 @@ typedef struct audio_encoder_s { audio_encoder_t *new_audio_encoder(muxer_stream_t *stream, audio_encoding_params_t *params); -#endif /* MPAE_H */ +#endif /* AE_H */ diff --git a/libmpcodecs/ae_faac.h b/libmpcodecs/ae_faac.h index bc0cdff6b6..10366e03b6 100644 --- a/libmpcodecs/ae_faac.h +++ b/libmpcodecs/ae_faac.h @@ -1,8 +1,8 @@ -#ifndef MPAE_FAAC_H -#define MPAE_FAAC_H +#ifndef AE_FAAC_H +#define AE_FAAC_H #include "ae.h" int mpae_init_faac(audio_encoder_t *encoder); -#endif /* MPAE_FAAC_H */ +#endif /* AE_FAAC_H */ diff --git a/libmpcodecs/ae_toolame.h b/libmpcodecs/ae_toolame.h index 8deabdffe0..06c8c35b8e 100644 --- a/libmpcodecs/ae_toolame.h +++ b/libmpcodecs/ae_toolame.h @@ -1,5 +1,5 @@ -#ifndef MPAE_TOOLAME_H -#define MPAE_TOOLAME_H +#ifndef AE_TOOLAME_H +#define AE_TOOLAME_H #include "ae.h" #include @@ -13,4 +13,4 @@ typedef struct { int mpae_init_toolame(audio_encoder_t *encoder); -#endif /* MPAE_TOOLAME_H */ +#endif /* AE_TOOLAME_H */ diff --git a/libmpcodecs/ae_twolame.h b/libmpcodecs/ae_twolame.h index 08811f7680..ae226ea059 100644 --- a/libmpcodecs/ae_twolame.h +++ b/libmpcodecs/ae_twolame.h @@ -1,5 +1,5 @@ -#ifndef MPAE_TWOLAME_H -#define MPAE_TWOLAME_H +#ifndef AE_TWOLAME_H +#define AE_TWOLAME_H #include "ae.h" #include @@ -11,4 +11,4 @@ typedef struct { int mpae_init_twolame(audio_encoder_t *encoder); -#endif /* MPAE_TWOLAME_H */ +#endif /* AE_TWOLAME_H */ diff --git a/libmpcodecs/mpc_info.h b/libmpcodecs/mpc_info.h index 3cb9a2cbd2..fadf898290 100644 --- a/libmpcodecs/mpc_info.h +++ b/libmpcodecs/mpc_info.h @@ -1,6 +1,6 @@ +#ifndef MPC_INFO_H +#define MPC_INFO_H -#ifndef MP_CODEC_INFO_T -#define MP_CODEC_INFO_T typedef struct mp_codec_info_s { /* codec long name ("Autodesk FLI/FLC Animation decoder" */ @@ -22,4 +22,4 @@ typedef struct mp_codec_info_s #define CONTROL_ERROR -2 #define CONTROL_NA -3 -#endif /* MP_CODEC_INFO_T */ +#endif /* MPC_INFO_H */ diff --git a/libmpcodecs/native/mmx.h b/libmpcodecs/native/mmx.h index d9a6fb65cb..0a41e0e8a7 100644 --- a/libmpcodecs/native/mmx.h +++ b/libmpcodecs/native/mmx.h @@ -1,5 +1,5 @@ -#ifndef MPLAYER_MMX_H -#define MPLAYER_MMX_H +#ifndef MMX_H +#define MMX_H typedef union { long long q; /* Quadword (64-bit) value */ @@ -77,4 +77,4 @@ typedef union { #define emms() __asm__ __volatile__ ("emms") -#endif /* MPLAYER_MMX_H */ +#endif /* MMX_H */ diff --git a/libmpcodecs/vqf.h b/libmpcodecs/vqf.h index 54d6ca0850..8e43889def 100644 --- a/libmpcodecs/vqf.h +++ b/libmpcodecs/vqf.h @@ -5,8 +5,8 @@ // Modified for MPlayer on 2004.12.29 -#ifndef tvqdec_h -#define tvqdec_h +#ifndef VQF_H +#define VQF_H #ifdef _MSC_VER # ifdef DLL_MODULE @@ -223,4 +223,4 @@ DllPort int TvqGetFbTotalBits(); // query total number of used bits #endif -#endif /* tvqdec_h */ +#endif /* VQF_H */ diff --git a/libmpdemux/demux_xmms_plugin.h b/libmpdemux/demux_xmms_plugin.h index 5aa176f952..e0020fd224 100644 --- a/libmpdemux/demux_xmms_plugin.h +++ b/libmpdemux/demux_xmms_plugin.h @@ -21,8 +21,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -#ifndef PLUGIN_H -#define PLUGIN_H +#ifndef DEMUX_XMMS_PLUGIN_H +#define DEMUX_XMMS_PLUGIN_H typedef enum { @@ -152,4 +152,4 @@ typedef struct VisPlugin void (*render_freq)(short freq_data[2][256]); /* Render the freq data, don't do anything time consuming in here */ } VisPlugin; -#endif /* PLUGIN_H */ +#endif /* DEMUX_XMMS_PLUGIN_H */ diff --git a/libvo/font_load.h b/libvo/font_load.h index 0c7fe42890..2d24e79023 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 FONT_LOAD_H +#define FONT_LOAD_H #ifdef HAVE_FREETYPE #include @@ -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 /* FONT_LOAD_H */ diff --git a/loader/ext.h b/loader/ext.h index 4e3daf35a2..e1b2258161 100644 --- a/loader/ext.h +++ b/loader/ext.h @@ -3,8 +3,8 @@ * http://svn.mplayerhq.hu/mplayer/trunk/ */ -#ifndef loader_ext_h -#define loader_ext_h +#ifndef LOADER_EXT_H +#define LOADER_EXT_H #include "wine/windef.h" @@ -16,4 +16,4 @@ extern int FILE_munmap( LPVOID start, DWORD size_high, DWORD size_low ); extern int wcsnicmp(const unsigned short* s1, const unsigned short* s2, int n); extern int __vprintf( const char *format, ... ); -#endif /* loader_ext_h */ +#endif /* LOADER_EXT_H */ diff --git a/stream/librtsp/rtsp.h b/stream/librtsp/rtsp.h index 2c3c32eb6d..bc6a4f52a1 100644 --- a/stream/librtsp/rtsp.h +++ b/stream/librtsp/rtsp.h @@ -29,8 +29,8 @@ * fixed a lot of RFC compliance issues. */ -#ifndef HAVE_RTSP_H -#define HAVE_RTSP_H +#ifndef RTSP_H +#define RTSP_H /* some codes returned by rtsp_request_* functions */ @@ -80,4 +80,4 @@ void rtsp_schedule_field(rtsp_t *s, const char *string); void rtsp_unschedule_field(rtsp_t *s, const char *string); void rtsp_unschedule_all(rtsp_t *s); -#endif /* HAVE_RTSP_H */ +#endif /* RTSP_H */ diff --git a/stream/librtsp/rtsp_rtp.h b/stream/librtsp/rtsp_rtp.h index 95539cf0ed..15cddf6c7e 100644 --- a/stream/librtsp/rtsp_rtp.h +++ b/stream/librtsp/rtsp_rtp.h @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef HAVE_RTSP_RTP_H -#define HAVE_RTSP_RTP_H +#ifndef RTSP_RTP_H +#define RTSP_RTP_H #include "rtsp.h" @@ -37,5 +37,5 @@ off_t rtp_read (struct rtp_rtsp_session_t* st, char *buf, off_t length); void rtp_session_free (struct rtp_rtsp_session_t *st); void rtcp_send_rr (rtsp_t *s, struct rtp_rtsp_session_t *st); -#endif /* HAVE_RTSP_RTP_H */ +#endif /* RTSP_RTP_H */ diff --git a/stream/pnm.h b/stream/pnm.h index fedc079db0..3654e652e8 100644 --- a/stream/pnm.h +++ b/stream/pnm.h @@ -22,8 +22,8 @@ * pnm util functions header by joschka */ -#ifndef HAVE_PNM_H -#define HAVE_PNM_H +#ifndef PNM_H +#define PNM_H #include /*#include "xine_internal.h" */ @@ -34,4 +34,4 @@ typedef struct pnm_s pnm_t; //int pnm_read (pnm_t *this, char *data, int len); -#endif /* HAVE_PNM_H */ +#endif /* PNM_H */ diff --git a/stream/realrtsp/asmrp.h b/stream/realrtsp/asmrp.h index 1d073e6aeb..ac647011f1 100644 --- a/stream/realrtsp/asmrp.h +++ b/stream/realrtsp/asmrp.h @@ -37,11 +37,11 @@ */ -#ifndef HAVE_ASMRP_H -#define HAVE_ASMRP_H +#ifndef ASMRP_H +#define ASMRP_H #define MAX_RULEMATCHES 16 int asmrp_match (const char *rules, int bandwidth, int *matches) ; -#endif /* HAVE_ASMRP_H */ +#endif /* ASMRP_H */ diff --git a/stream/realrtsp/xbuffer.h b/stream/realrtsp/xbuffer.h index ecc72c0bac..84d91a8dc3 100644 --- a/stream/realrtsp/xbuffer.h +++ b/stream/realrtsp/xbuffer.h @@ -14,8 +14,8 @@ */ -#ifndef XCL_H -#define XCL_H +#ifndef XBUFFER_H +#define XBUFFER_H void *xbuffer_init(int chunk_size); void *xbuffer_free(void *buf); @@ -23,4 +23,4 @@ void *xbuffer_copyin(void *buf, int index, const void *data, int len); void *xbuffer_ensure_size(void *buf, int size); void *xbuffer_strcat(void *buf, char *data); -#endif /* XCL_H */ +#endif /* XBUFFER_H */ diff --git a/vidix/dha.h b/vidix/dha.h index bb9a24a022..5f4035b42a 100644 --- a/vidix/dha.h +++ b/vidix/dha.h @@ -33,8 +33,8 @@ * Original location: www.linuxvideo.org/gatos */ -#ifndef LIBDHA_H -#define LIBDHA_H +#ifndef DHA_H +#define DHA_H #ifdef __cplusplus extern "C" { @@ -92,4 +92,4 @@ extern int mtrr_set_type(unsigned base,unsigned size,int type); } #endif -#endif /* LIBDHA_H */ +#endif /* DHA_H */ -- cgit v1.2.3