From 8efb2fa21c81f99b37795621f9ec2bc125c6ced0 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 22 Feb 2008 09:09:46 +0000 Subject: Add MPLAYER_ prefix to multiple inclusion guards. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/audio_in.h | 6 +++--- stream/cache2.h | 6 +++--- stream/cdd.h | 6 +++--- stream/cookies.h | 6 +++--- stream/dvbin.h | 6 +++--- stream/frequencies.h | 6 +++--- stream/http.h | 6 +++--- stream/librtsp/rtsp.h | 6 +++--- stream/librtsp/rtsp_rtp.h | 6 +++--- stream/librtsp/rtsp_session.h | 6 +++--- stream/netstream.h | 6 +++--- stream/network.h | 6 +++--- stream/pnm.h | 6 +++--- stream/pvr.h | 6 +++--- stream/realrtsp/asmrp.h | 6 +++--- stream/realrtsp/real.h | 6 +++--- stream/realrtsp/rmff.h | 9 ++++----- stream/realrtsp/sdpplin.h | 8 ++++---- stream/realrtsp/xbuffer.h | 7 +++---- stream/rtp.h | 6 +++--- stream/stream.h | 6 +++--- stream/stream_dvd.h | 6 +++--- stream/stream_dvd_common.h | 6 +++--- stream/stream_radio.h | 6 +++--- stream/tcp.h | 6 +++--- stream/tv.h | 6 +++--- stream/tvi_def.h | 6 +++--- stream/tvi_dshow.h | 6 +++--- stream/udp.h | 6 +++--- stream/url.h | 6 +++--- stream/vcd_read.h | 6 +++--- stream/vcd_read_darwin.h | 6 +++--- stream/vcd_read_fbsd.h | 6 +++--- stream/vcd_read_win32.h | 6 +++--- 34 files changed, 104 insertions(+), 106 deletions(-) (limited to 'stream') diff --git a/stream/audio_in.h b/stream/audio_in.h index 643b7d5ac3..97bd534433 100644 --- a/stream/audio_in.h +++ b/stream/audio_in.h @@ -1,5 +1,5 @@ -#ifndef AUDIO_IN_H -#define AUDIO_IN_H +#ifndef MPLAYER_AUDIO_IN_H +#define MPLAYER_AUDIO_IN_H #define AUDIO_IN_ALSA 1 #define AUDIO_IN_OSS 2 @@ -72,4 +72,4 @@ int ai_oss_set_channels(audio_in_t *ai); int ai_oss_init(audio_in_t *ai); #endif -#endif /* AUDIO_IN_H */ +#endif /* MPLAYER_AUDIO_IN_H */ diff --git a/stream/cache2.h b/stream/cache2.h index 924202735f..99f0378d75 100644 --- a/stream/cache2.h +++ b/stream/cache2.h @@ -1,6 +1,6 @@ -#ifndef CACHE2_H -#define CACHE2_H +#ifndef MPLAYER_CACHE2_H +#define MPLAYER_CACHE2_H extern void cache_uninit(stream_t *s); -#endif /* CACHE2_H */ +#endif /* MPLAYER_CACHE2_H */ diff --git a/stream/cdd.h b/stream/cdd.h index bab1035545..10fb64763f 100644 --- a/stream/cdd.h +++ b/stream/cdd.h @@ -1,5 +1,5 @@ -#ifndef CDD_H -#define CDD_H +#ifndef MPLAYER_CDD_H +#define MPLAYER_CDD_H #include "config.h" #ifndef HAVE_LIBCDIO @@ -74,4 +74,4 @@ cd_track_t* cd_info_get_track(cd_info_t *cd_info, unsigned int track_nb); void cd_info_debug(cd_info_t *cd_info); -#endif /* CDD_H */ +#endif /* MPLAYER_CDD_H */ diff --git a/stream/cookies.h b/stream/cookies.h index 4f5c4f7511..f1619110ce 100644 --- a/stream/cookies.h +++ b/stream/cookies.h @@ -5,12 +5,12 @@ * by Dave Lambley */ -#ifndef COOKIES_H -#define COOKIES_H +#ifndef MPLAYER_COOKIES_H +#define MPLAYER_COOKIES_H #include "http.h" extern void cookies_set(HTTP_header_t * http_hdr, const char *hostname, const char *url); -#endif /* COOKIES_H */ +#endif /* MPLAYER_COOKIES_H */ diff --git a/stream/dvbin.h b/stream/dvbin.h index 31c4d6b383..c24832c4d2 100644 --- a/stream/dvbin.h +++ b/stream/dvbin.h @@ -5,8 +5,8 @@ * $Id$ */ -#ifndef DVBIN_H -#define DVBIN_H +#ifndef MPLAYER_DVBIN_H +#define MPLAYER_DVBIN_H #include "stream.h" @@ -113,4 +113,4 @@ extern int dvb_set_channel(stream_t *, int, int); extern dvb_config_t *dvb_get_config(void); extern void dvb_free_config(dvb_config_t *config); -#endif /* DVBIN_H */ +#endif /* MPLAYER_DVBIN_H */ diff --git a/stream/frequencies.h b/stream/frequencies.h index 234a2adb86..bf822d468b 100644 --- a/stream/frequencies.h +++ b/stream/frequencies.h @@ -6,8 +6,8 @@ * Frequencies are given in kHz */ -#ifndef FREQUENCIES_H -#define FREQUENCIES_H +#ifndef MPLAYER_FREQUENCIES_H +#define MPLAYER_FREQUENCIES_H #define NTSC_AUDIO_CARRIER 4500 #define PAL_AUDIO_CARRIER_I 6000 @@ -114,4 +114,4 @@ extern int chantab; extern const struct CHANLIST *chanlist; extern int chancount; -#endif /* FREQUENCIES_H */ +#endif /* MPLAYER_FREQUENCIES_H */ diff --git a/stream/http.h b/stream/http.h index 573da81b05..0cb3752e11 100644 --- a/stream/http.h +++ b/stream/http.h @@ -4,8 +4,8 @@ * (C) 2001, MPlayer team. */ -#ifndef HTTP_H -#define HTTP_H +#ifndef MPLAYER_HTTP_H +#define MPLAYER_HTTP_H typedef struct HTTP_field_type { char *field_name; @@ -49,4 +49,4 @@ int http_add_basic_authentication( HTTP_header_t *http_hdr, const char *usernam void http_debug_hdr( HTTP_header_t *http_hdr ); int base64_encode(const void *enc, int encLen, char *out, int outMax); -#endif /* HTTP_H */ +#endif /* MPLAYER_HTTP_H */ diff --git a/stream/librtsp/rtsp.h b/stream/librtsp/rtsp.h index bc6a4f52a1..528dacaa42 100644 --- a/stream/librtsp/rtsp.h +++ b/stream/librtsp/rtsp.h @@ -29,8 +29,8 @@ * fixed a lot of RFC compliance issues. */ -#ifndef RTSP_H -#define RTSP_H +#ifndef MPLAYER_RTSP_H +#define MPLAYER_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 /* RTSP_H */ +#endif /* MPLAYER_RTSP_H */ diff --git a/stream/librtsp/rtsp_rtp.h b/stream/librtsp/rtsp_rtp.h index 15cddf6c7e..ffdc806add 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 RTSP_RTP_H -#define RTSP_RTP_H +#ifndef MPLAYER_RTSP_RTP_H +#define MPLAYER_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 /* RTSP_RTP_H */ +#endif /* MPLAYER_RTSP_RTP_H */ diff --git a/stream/librtsp/rtsp_session.h b/stream/librtsp/rtsp_session.h index da2ede77ab..53f0f3ea10 100644 --- a/stream/librtsp/rtsp_session.h +++ b/stream/librtsp/rtsp_session.h @@ -28,8 +28,8 @@ * Support for MPEG-TS streaming through RFC compliant RTSP servers */ -#ifndef HAVE_RTSP_SESSION_H -#define HAVE_RTSP_SESSION_H +#ifndef MPLAYER_RTSP_SESSION_H +#define MPLAYER_RTSP_SESSION_H typedef struct rtsp_session_s rtsp_session_t; @@ -40,4 +40,4 @@ int rtsp_session_read(rtsp_session_t *session, char *data, int len); void rtsp_session_end(rtsp_session_t *session); -#endif /* HAVE_RTSP_SESSION_H */ +#endif /* MPLAYER_RTSP_SESSION_H */ diff --git a/stream/netstream.h b/stream/netstream.h index 75fe94cdd5..e092ef126c 100644 --- a/stream/netstream.h +++ b/stream/netstream.h @@ -7,8 +7,8 @@ * Data is always low endian */ -#ifndef NETSTREAM_H -#define NETSTREAM_H +#ifndef MPLAYER_NETSTREAM_H +#define MPLAYER_NETSTREAM_H typedef struct mp_net_stream_packet_st { uint16_t len; @@ -138,4 +138,4 @@ static void net_stream_opened_2_me(mp_net_stream_opened_t* o) { o->end_pos = le2me_64(o->end_pos); } -#endif /* NETSTREAM_H */ +#endif /* MPLAYER_NETSTREAM_H */ diff --git a/stream/network.h b/stream/network.h index 37ee0e9a4b..ef5fa2dceb 100644 --- a/stream/network.h +++ b/stream/network.h @@ -4,8 +4,8 @@ * (C) 2001, MPlayer team. */ -#ifndef NETWORK_H -#define NETWORK_H +#ifndef MPLAYER_NETWORK_H +#define MPLAYER_NETWORK_H #include #include @@ -63,4 +63,4 @@ HTTP_header_t *http_read_response(int fd); int http_authenticate(HTTP_header_t *http_hdr, URL_t *url, int *auth_retry); URL_t* check4proxies(URL_t *url); -#endif /* NETWORK_H */ +#endif /* MPLAYER_NETWORK_H */ diff --git a/stream/pnm.h b/stream/pnm.h index 3654e652e8..42b4388a53 100644 --- a/stream/pnm.h +++ b/stream/pnm.h @@ -22,8 +22,8 @@ * pnm util functions header by joschka */ -#ifndef PNM_H -#define PNM_H +#ifndef MPLAYER_PNM_H +#define MPLAYER_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 /* PNM_H */ +#endif /* MPLAYER_PNM_H */ diff --git a/stream/pvr.h b/stream/pvr.h index 259aa829e9..f358e89018 100644 --- a/stream/pvr.h +++ b/stream/pvr.h @@ -21,8 +21,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef PVR_H -#define PVR_H +#ifndef MPLAYER_PVR_H +#define MPLAYER_PVR_H #include "tv.h" @@ -84,4 +84,4 @@ int pvr_set_channel_step (stream_t *stream, int step); */ int pvr_force_freq_step (stream_t *stream, int step); -#endif /* PVR_H */ +#endif /* MPLAYER_PVR_H */ diff --git a/stream/realrtsp/asmrp.h b/stream/realrtsp/asmrp.h index ac647011f1..b5616db59a 100644 --- a/stream/realrtsp/asmrp.h +++ b/stream/realrtsp/asmrp.h @@ -37,11 +37,11 @@ */ -#ifndef ASMRP_H -#define ASMRP_H +#ifndef MPLAYER_ASMRP_H +#define MPLAYER_ASMRP_H #define MAX_RULEMATCHES 16 int asmrp_match (const char *rules, int bandwidth, int *matches) ; -#endif /* ASMRP_H */ +#endif /* MPLAYER_ASMRP_H */ diff --git a/stream/realrtsp/real.h b/stream/realrtsp/real.h index fd78edfc78..37ac03b28e 100644 --- a/stream/realrtsp/real.h +++ b/stream/realrtsp/real.h @@ -27,8 +27,8 @@ * */ -#ifndef HAVE_REAL_H -#define HAVE_REAL_H +#ifndef MPLAYER_REAL_H +#define MPLAYER_REAL_H #include "rmff.h" #include "../librtsp/rtsp.h" @@ -57,4 +57,4 @@ rmff_header_t *real_setup_and_get_header(rtsp_t *rtsp_session, uint32_t bandwidt struct real_rtsp_session_t *init_real_rtsp_session (void); void free_real_rtsp_session (struct real_rtsp_session_t* real_session); -#endif /* HAVE_REAL_H */ +#endif /* MPLAYER_REAL_H */ diff --git a/stream/realrtsp/rmff.h b/stream/realrtsp/rmff.h index 807c05e2ce..639b8522bb 100644 --- a/stream/realrtsp/rmff.h +++ b/stream/realrtsp/rmff.h @@ -26,6 +26,9 @@ * adopted from joschkas real tools */ +#ifndef MPLAYER_RMFF_H +#define MPLAYER_RMFF_H + #include #include "config.h" #ifndef HAVE_WINSOCK2 @@ -43,10 +46,6 @@ #include -#ifndef HAVE_RMFF_H -#define HAVE_RMFF_H - - #define RMFF_HEADER_SIZE 0x12 #define RMFF_FILEHEADER_SIZE 18 @@ -273,4 +272,4 @@ void rmff_dump_pheader(rmff_pheader_t *h, char *data); */ void rmff_free_header(rmff_header_t *h); -#endif /* HAVE_RMFF_H */ +#endif /* MPLAYER_RMFF_H */ diff --git a/stream/realrtsp/sdpplin.h b/stream/realrtsp/sdpplin.h index 24a7f206a4..ff79c49775 100644 --- a/stream/realrtsp/sdpplin.h +++ b/stream/realrtsp/sdpplin.h @@ -25,9 +25,9 @@ * sdp/sdpplin parser. * */ - -#ifndef HAVE_SDPPLIN_H -#define HAVE_SDPPLIN_H + +#ifndef MPLAYER_SDPPLIN_H +#define MPLAYER_SDPPLIN_H #include "rmff.h" #include "../librtsp/rtsp.h" @@ -105,4 +105,4 @@ sdpplin_t *sdpplin_parse(char *data); void sdpplin_free(sdpplin_t *description); -#endif /* HAVE_SDPPLIN_H */ +#endif /* MPLAYER_SDPPLIN_H */ diff --git a/stream/realrtsp/xbuffer.h b/stream/realrtsp/xbuffer.h index 84d91a8dc3..f311290d7e 100644 --- a/stream/realrtsp/xbuffer.h +++ b/stream/realrtsp/xbuffer.h @@ -13,9 +13,8 @@ * */ - -#ifndef XBUFFER_H -#define XBUFFER_H +#ifndef MPLAYER_XBUFFER_H +#define MPLAYER_XBUFFER_H void *xbuffer_init(int chunk_size); void *xbuffer_free(void *buf); @@ -23,4 +22,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 /* XBUFFER_H */ +#endif /* MPLAYER_XBUFFER_H */ diff --git a/stream/rtp.h b/stream/rtp.h index c451536414..d35ae4753d 100644 --- a/stream/rtp.h +++ b/stream/rtp.h @@ -5,9 +5,9 @@ * $Id$ */ -#ifndef RTP_H -#define RTP_H +#ifndef MPLAYER_RTP_H +#define MPLAYER_RTP_H int read_rtp_from_server(int fd, char *buffer, int length); -#endif /* RTP_H */ +#endif /* MPLAYER_RTP_H */ diff --git a/stream/stream.h b/stream/stream.h index b97d72584f..5ef7df5fa0 100644 --- a/stream/stream.h +++ b/stream/stream.h @@ -1,5 +1,5 @@ -#ifndef STREAM_H -#define STREAM_H +#ifndef MPLAYER_STREAM_H +#define MPLAYER_STREAM_H #include "mp_msg.h" #include @@ -311,4 +311,4 @@ typedef struct { int channels; } stream_language_t; -#endif /* STREAM_H */ +#endif /* MPLAYER_STREAM_H */ diff --git a/stream/stream_dvd.h b/stream/stream_dvd.h index 020c45f8b7..de3661c564 100644 --- a/stream/stream_dvd.h +++ b/stream/stream_dvd.h @@ -1,5 +1,5 @@ -#ifndef STREAM_DVD_H -#define STREAM_DVD_H +#ifndef MPLAYER_STREAM_DVD_H +#define MPLAYER_STREAM_DVD_H #ifdef USE_DVDREAD_INTERNAL #include "dvdread/dvd_reader.h" @@ -48,4 +48,4 @@ int dvd_aid_from_lang(stream_t *stream, unsigned char* lang); int dvd_sid_from_lang(stream_t *stream, unsigned char* lang); int dvd_chapter_from_cell(dvd_priv_t *dvd,int title,int cell); -#endif /* STREAM_DVD_H */ +#endif /* MPLAYER_STREAM_DVD_H */ diff --git a/stream/stream_dvd_common.h b/stream/stream_dvd_common.h index 30a2a10fbc..b1e64172e5 100644 --- a/stream/stream_dvd_common.h +++ b/stream/stream_dvd_common.h @@ -1,6 +1,6 @@ -#ifndef STREAM_DVD_COMMON_H -#define STREAM_DVD_COMMON_H +#ifndef MPLAYER_STREAM_DVD_COMMON_H +#define MPLAYER_STREAM_DVD_COMMON_H int mp_dvdtimetomsec(dvd_time_t *dt); -#endif /* STREAM_DVD_COMMON_H */ +#endif /* MPLAYER_STREAM_DVD_COMMON_H */ diff --git a/stream/stream_radio.h b/stream/stream_radio.h index c04ec48483..726de124ac 100644 --- a/stream/stream_radio.h +++ b/stream/stream_radio.h @@ -1,5 +1,5 @@ -#ifndef STREAM_RADIO_H -#define STREAM_RADIO_H +#ifndef MPLAYER_STREAM_RADIO_H +#define MPLAYER_STREAM_RADIO_H #define RADIO_CHANNEL_LOWER 1 #define RADIO_CHANNEL_HIGHER 2 @@ -41,4 +41,4 @@ int radio_set_channel(struct stream_st *stream, char *channel); int radio_step_channel(struct stream_st *stream, int direction); int radio_step_freq(struct stream_st *stream, float step_interval); -#endif +#endif /* MPLAYER_STREAM_RADIO_H */ diff --git a/stream/tcp.h b/stream/tcp.h index 7299f20fc3..bb3b118025 100644 --- a/stream/tcp.h +++ b/stream/tcp.h @@ -19,8 +19,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef TCP_H -#define TCP_H +#ifndef MPLAYER_TCP_H +#define MPLAYER_TCP_H /* Connect to a server using a TCP connection */ int connect2Server (char *host, int port, int verb); @@ -29,4 +29,4 @@ int connect2Server (char *host, int port, int verb); #define TCP_ERROR_FATAL -2 /* unable to resolve name */ #define TCP_ERROR_PORT -1 /* unable to connect to a particular port */ -#endif /* TCP_H */ +#endif /* MPLAYER_TCP_H */ diff --git a/stream/tv.h b/stream/tv.h index a09df2c076..7413860ae0 100644 --- a/stream/tv.h +++ b/stream/tv.h @@ -1,5 +1,5 @@ -#ifndef TV_H -#define TV_H +#ifndef MPLAYER_TV_H +#define MPLAYER_TV_H //#include "libao2/afmt.h" //#include "libmpcodecs/img_format.h" @@ -344,4 +344,4 @@ typedef struct tt_stream_props_s{ int bufsize; ///< required buffer size } tt_stream_props; -#endif /* TV_H */ +#endif /* MPLAYER_TV_H */ diff --git a/stream/tvi_def.h b/stream/tvi_def.h index 19a9d9d08a..d12b8fbc34 100644 --- a/stream/tvi_def.h +++ b/stream/tvi_def.h @@ -1,5 +1,5 @@ -#ifndef TVI_DEF_H -#define TVI_DEF_H +#ifndef MPLAYER_TVI_DEF_H +#define MPLAYER_TVI_DEF_H #include /* malloc */ #include /* memset */ @@ -107,4 +107,4 @@ static inline void fill_blank_frame(char* buffer,int len,int fmt){ } } -#endif /* TVI_DEF_H */ +#endif /* MPLAYER_TVI_DEF_H */ diff --git a/stream/tvi_dshow.h b/stream/tvi_dshow.h index d5047ef361..bc347e5930 100644 --- a/stream/tvi_dshow.h +++ b/stream/tvi_dshow.h @@ -1,5 +1,5 @@ -#ifndef TVI_DSHOW_H_ -#define TVI_DSHOW_H_ +#ifndef MPLAYER_TVI_DSHOW_H +#define MPLAYER_TVI_DSHOW_H /// \defgroup tvi_dshow TV driver (Directshow) @@ -690,4 +690,4 @@ DECLARE_ENUMERATOR_(IEnumMediaTypes, AM_MEDIA_TYPE *); #define OLE_RELEASE_SAFE(p) if(p){ OLE_CALL((IUnknown*)p,Release); p=NULL;} #define OLE_QUERYINTERFACE(p,iface,ptr) OLE_CALL_ARGS((IUnknown*)p,QueryInterface,&iface,(void*)&ptr) -#endif // TVI_DSHOW_H_ +#endif /* MPLAYER_TVI_DSHOW_H */ diff --git a/stream/udp.h b/stream/udp.h index 75de24703d..6af6f6817d 100644 --- a/stream/udp.h +++ b/stream/udp.h @@ -17,9 +17,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef UDP_H -#define UDP_H +#ifndef MPLAYER_UDP_H +#define MPLAYER_UDP_H int udp_open_socket (URL_t *url); -#endif /* UDP_H */ +#endif /* MPLAYER_UDP_H */ diff --git a/stream/url.h b/stream/url.h index 4711dbeb4e..1f13bee1d7 100644 --- a/stream/url.h +++ b/stream/url.h @@ -4,8 +4,8 @@ * (C) 2001, MPlayer team. */ -#ifndef URL_H -#define URL_H +#ifndef MPLAYER_URL_H +#define MPLAYER_URL_H //#define URL_DEBUG @@ -30,4 +30,4 @@ void url_escape_string(char *outbuf, const char *inbuf); void url_debug(const URL_t* url); #endif /* URL_DEBUG */ -#endif /* URL_H */ +#endif /* MPLAYER_URL_H */ diff --git a/stream/vcd_read.h b/stream/vcd_read.h index b7bb379b7d..cf876d98e4 100644 --- a/stream/vcd_read.h +++ b/stream/vcd_read.h @@ -1,5 +1,5 @@ -#ifndef VCD_READ_H -#define VCD_READ_H +#ifndef MPLAYER_VCD_READ_H +#define MPLAYER_VCD_READ_H #include "libavutil/intreadwrite.h" //=================== VideoCD ========================== @@ -225,4 +225,4 @@ static int sun_vcd_read(mp_vcd_priv_t* vcd, int *offset) #endif -#endif /* VCD_READ_H */ +#endif /* MPLAYER_VCD_READ_H */ diff --git a/stream/vcd_read_darwin.h b/stream/vcd_read_darwin.h index 85076d46cd..ca9eed4f62 100644 --- a/stream/vcd_read_darwin.h +++ b/stream/vcd_read_darwin.h @@ -1,5 +1,5 @@ -#ifndef VCD_READ_DARWIN_H -#define VCD_READ_DARWIN_H +#ifndef MPLAYER_VCD_READ_DARWIN_H +#define MPLAYER_VCD_READ_DARWIN_H #include #include @@ -203,4 +203,4 @@ static int vcd_read(mp_vcd_priv_t* vcd,char *mem) return VCD_SECTOR_DATA; } -#endif /* VCD_READ_DARWIN_H */ +#endif /* MPLAYER_VCD_READ_DARWIN_H */ diff --git a/stream/vcd_read_fbsd.h b/stream/vcd_read_fbsd.h index 3b061b9121..da9477a7cb 100644 --- a/stream/vcd_read_fbsd.h +++ b/stream/vcd_read_fbsd.h @@ -1,5 +1,5 @@ -#ifndef VCD_READ_FBSD_H -#define VCD_READ_FBSD_H +#ifndef MPLAYER_VCD_READ_FBSD_H +#define MPLAYER_VCD_READ_FBSD_H #include #include @@ -233,4 +233,4 @@ vcd_read(mp_vcd_priv_t* vcd, char *mem) return VCD_SECTOR_DATA; } -#endif /* VCD_READ_FBSD_H */ +#endif /* MPLAYER_VCD_READ_FBSD_H */ diff --git a/stream/vcd_read_win32.h b/stream/vcd_read_win32.h index 6a2f17f87c..86bfbf4fa4 100644 --- a/stream/vcd_read_win32.h +++ b/stream/vcd_read_win32.h @@ -1,5 +1,5 @@ -#ifndef VCD_READ_WIN32_H -#define VCD_READ_WIN32_H +#ifndef MPLAYER_VCD_READ_WIN32_H +#define MPLAYER_VCD_READ_WIN32_H #include @@ -130,7 +130,7 @@ static int vcd_read(mp_vcd_priv_t* vcd, char *mem) return VCD_SECTOR_DATA; } -#endif /* VCD_READ_WIN32_H */ +#endif /* MPLAYER_VCD_READ_WIN32_H */ /* vim:noet:sw=4:cino=\:0,g0 -- cgit v1.2.3