[MPlayer-cvslog] r25897 - in trunk: libass/mputils.h libmpcodecs/ae.h libmpcodecs/ae_faac.h libmpcodecs/ae_toolame.h libmpcodecs/ae_twolame.h libmpcodecs/mpc_info.h libmpcodecs/native/mmx.h libmpcodecs/vqf.h libmpdemux/demux_xmms_plugin.h libvo/font_load.h loader/ext.h stream/librtsp/rtsp.h stream/librtsp/rtsp_rtp.h stream/pnm.h stream/realrtsp/asmrp.h stream/realrtsp/xbuffer.h vidix/dha.h
diego
subversion at mplayerhq.hu
Mon Jan 28 02:32:52 CET 2008
Author: diego
Date: Mon Jan 28 02:32:52 2008
New Revision: 25897
Log:
Consistently use uppercase filename as multiple inclusion guard.
Modified:
trunk/libass/mputils.h
trunk/libmpcodecs/ae.h
trunk/libmpcodecs/ae_faac.h
trunk/libmpcodecs/ae_toolame.h
trunk/libmpcodecs/ae_twolame.h
trunk/libmpcodecs/mpc_info.h
trunk/libmpcodecs/native/mmx.h
trunk/libmpcodecs/vqf.h
trunk/libmpdemux/demux_xmms_plugin.h
trunk/libvo/font_load.h
trunk/loader/ext.h
trunk/stream/librtsp/rtsp.h
trunk/stream/librtsp/rtsp_rtp.h
trunk/stream/pnm.h
trunk/stream/realrtsp/asmrp.h
trunk/stream/realrtsp/xbuffer.h
trunk/vidix/dha.h
Modified: trunk/libass/mputils.h
==============================================================================
--- trunk/libass/mputils.h (original)
+++ trunk/libass/mputils.h Mon Jan 28 02:32:52 2008
@@ -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 */
Modified: trunk/libmpcodecs/ae.h
==============================================================================
--- trunk/libmpcodecs/ae.h (original)
+++ trunk/libmpcodecs/ae.h Mon Jan 28 02:32:52 2008
@@ -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 */
Modified: trunk/libmpcodecs/ae_faac.h
==============================================================================
--- trunk/libmpcodecs/ae_faac.h (original)
+++ trunk/libmpcodecs/ae_faac.h Mon Jan 28 02:32:52 2008
@@ -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 */
Modified: trunk/libmpcodecs/ae_toolame.h
==============================================================================
--- trunk/libmpcodecs/ae_toolame.h (original)
+++ trunk/libmpcodecs/ae_toolame.h Mon Jan 28 02:32:52 2008
@@ -1,5 +1,5 @@
-#ifndef MPAE_TOOLAME_H
-#define MPAE_TOOLAME_H
+#ifndef AE_TOOLAME_H
+#define AE_TOOLAME_H
#include "ae.h"
#include <toolame.h>
@@ -13,4 +13,4 @@ typedef struct {
int mpae_init_toolame(audio_encoder_t *encoder);
-#endif /* MPAE_TOOLAME_H */
+#endif /* AE_TOOLAME_H */
Modified: trunk/libmpcodecs/ae_twolame.h
==============================================================================
--- trunk/libmpcodecs/ae_twolame.h (original)
+++ trunk/libmpcodecs/ae_twolame.h Mon Jan 28 02:32:52 2008
@@ -1,5 +1,5 @@
-#ifndef MPAE_TWOLAME_H
-#define MPAE_TWOLAME_H
+#ifndef AE_TWOLAME_H
+#define AE_TWOLAME_H
#include "ae.h"
#include <twolame.h>
@@ -11,4 +11,4 @@ typedef struct {
int mpae_init_twolame(audio_encoder_t *encoder);
-#endif /* MPAE_TWOLAME_H */
+#endif /* AE_TWOLAME_H */
Modified: trunk/libmpcodecs/mpc_info.h
==============================================================================
--- trunk/libmpcodecs/mpc_info.h (original)
+++ trunk/libmpcodecs/mpc_info.h Mon Jan 28 02:32:52 2008
@@ -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 */
Modified: trunk/libmpcodecs/native/mmx.h
==============================================================================
--- trunk/libmpcodecs/native/mmx.h (original)
+++ trunk/libmpcodecs/native/mmx.h Mon Jan 28 02:32:52 2008
@@ -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 */
Modified: trunk/libmpcodecs/vqf.h
==============================================================================
--- trunk/libmpcodecs/vqf.h (original)
+++ trunk/libmpcodecs/vqf.h Mon Jan 28 02:32:52 2008
@@ -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(); // q
#endif
-#endif /* tvqdec_h */
+#endif /* VQF_H */
Modified: trunk/libmpdemux/demux_xmms_plugin.h
==============================================================================
--- trunk/libmpdemux/demux_xmms_plugin.h (original)
+++ trunk/libmpdemux/demux_xmms_plugin.h Mon Jan 28 02:32:52 2008
@@ -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 */
Modified: trunk/libvo/font_load.h
==============================================================================
--- trunk/libvo/font_load.h (original)
+++ trunk/libvo/font_load.h Mon Jan 28 02:32:52 2008
@@ -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 <ft2build.h>
@@ -102,4 +102,4 @@ static int kerning(font_desc_t *desc, in
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 */
Modified: trunk/loader/ext.h
==============================================================================
--- trunk/loader/ext.h (original)
+++ trunk/loader/ext.h Mon Jan 28 02:32:52 2008
@@ -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, DW
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 */
Modified: trunk/stream/librtsp/rtsp.h
==============================================================================
--- trunk/stream/librtsp/rtsp.h (original)
+++ trunk/stream/librtsp/rtsp.h Mon Jan 28 02:32:52 2008
@@ -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, cons
void rtsp_unschedule_field(rtsp_t *s, const char *string);
void rtsp_unschedule_all(rtsp_t *s);
-#endif /* HAVE_RTSP_H */
+#endif /* RTSP_H */
Modified: trunk/stream/librtsp/rtsp_rtp.h
==============================================================================
--- trunk/stream/librtsp/rtsp_rtp.h (original)
+++ trunk/stream/librtsp/rtsp_rtp.h Mon Jan 28 02:32:52 2008
@@ -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_
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 */
Modified: trunk/stream/pnm.h
==============================================================================
--- trunk/stream/pnm.h (original)
+++ trunk/stream/pnm.h Mon Jan 28 02:32:52 2008
@@ -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 <inttypes.h>
/*#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 */
Modified: trunk/stream/realrtsp/asmrp.h
==============================================================================
--- trunk/stream/realrtsp/asmrp.h (original)
+++ trunk/stream/realrtsp/asmrp.h Mon Jan 28 02:32:52 2008
@@ -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 */
Modified: trunk/stream/realrtsp/xbuffer.h
==============================================================================
--- trunk/stream/realrtsp/xbuffer.h (original)
+++ trunk/stream/realrtsp/xbuffer.h Mon Jan 28 02:32:52 2008
@@ -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 inde
void *xbuffer_ensure_size(void *buf, int size);
void *xbuffer_strcat(void *buf, char *data);
-#endif /* XCL_H */
+#endif /* XBUFFER_H */
Modified: trunk/vidix/dha.h
==============================================================================
--- trunk/vidix/dha.h (original)
+++ trunk/vidix/dha.h Mon Jan 28 02:32:52 2008
@@ -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,u
}
#endif
-#endif /* LIBDHA_H */
+#endif /* DHA_H */
More information about the MPlayer-cvslog
mailing list