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 --- stream/audio_in.h | 6 +++--- stream/cache2.h | 4 ++-- stream/cdd.h | 6 +++--- stream/cookies.h | 4 ++-- stream/http.h | 6 +++--- stream/librtsp/rtsp_rtp.h | 6 +++--- stream/network.h | 4 ++-- stream/realrtsp/xbuffer.h | 4 ++-- stream/rtp.h | 4 ++-- stream/stream.h | 6 +++--- stream/stream_dvdnav.h | 4 ++-- stream/stream_radio.h | 4 ++-- stream/tcp.h | 6 +++--- stream/udp.h | 6 +++--- stream/url.h | 12 ++++++------ 15 files changed, 41 insertions(+), 41 deletions(-) (limited to 'stream') diff --git a/stream/audio_in.h b/stream/audio_in.h index c4b3ea91a7..643b7d5ac3 100644 --- a/stream/audio_in.h +++ b/stream/audio_in.h @@ -1,5 +1,5 @@ -#ifndef _audio_in_h -#define _audio_in_h +#ifndef AUDIO_IN_H +#define 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 /* AUDIO_IN_H */ diff --git a/stream/cache2.h b/stream/cache2.h index d8bffc9a50..645bf5ed47 100644 --- a/stream/cache2.h +++ b/stream/cache2.h @@ -1,5 +1,5 @@ -#ifndef _cache2_h -#define _cache2_h +#ifndef CACHE2_H +#define CACHE2_H extern void cache_uninit(stream_t *s); diff --git a/stream/cdd.h b/stream/cdd.h index ad8a7c150c..bab1035545 100644 --- a/stream/cdd.h +++ b/stream/cdd.h @@ -1,5 +1,5 @@ -#ifndef __CDD_H__ -#define __CDD_H__ +#ifndef CDD_H +#define 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 /* CDD_H */ diff --git a/stream/cookies.h b/stream/cookies.h index e4b1f13f9b..6cee753463 100644 --- a/stream/cookies.h +++ b/stream/cookies.h @@ -5,8 +5,8 @@ * by Dave Lambley */ -#ifndef __COOKIES_H -#define __COOKIES_H +#ifndef COOKIES_H +#define COOKIES_H #include "http.h" diff --git a/stream/http.h b/stream/http.h index 628de0f4e3..573da81b05 100644 --- a/stream/http.h +++ b/stream/http.h @@ -4,8 +4,8 @@ * (C) 2001, MPlayer team. */ -#ifndef __HTTP_H -#define __HTTP_H +#ifndef HTTP_H +#define 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 /* HTTP_H */ diff --git a/stream/librtsp/rtsp_rtp.h b/stream/librtsp/rtsp_rtp.h index 117a09e57b..95539cf0ed 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 HAVE_RTSP_RTP_H +#define HAVE_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 /* HAVE_RTSP_RTP_H */ diff --git a/stream/network.h b/stream/network.h index 8591fa32dc..26a9e76878 100644 --- a/stream/network.h +++ b/stream/network.h @@ -4,8 +4,8 @@ * (C) 2001, MPlayer team. */ -#ifndef __NETWORK_H -#define __NETWORK_H +#ifndef NETWORK_H +#define NETWORK_H #include #include diff --git a/stream/realrtsp/xbuffer.h b/stream/realrtsp/xbuffer.h index 0ee66c789f..8192258503 100644 --- a/stream/realrtsp/xbuffer.h +++ b/stream/realrtsp/xbuffer.h @@ -14,8 +14,8 @@ */ -#ifndef _XCL_H_ -#define _XCL_H_ +#ifndef XCL_H +#define XCL_H void *xbuffer_init(int chunk_size); void *xbuffer_free(void *buf); diff --git a/stream/rtp.h b/stream/rtp.h index 99e129f677..2bbabc3e4f 100644 --- a/stream/rtp.h +++ b/stream/rtp.h @@ -5,8 +5,8 @@ * $Id$ */ -#ifndef _RTP_H -#define _RTP_H +#ifndef RTP_H +#define RTP_H int read_rtp_from_server(int fd, char *buffer, int length); diff --git a/stream/stream.h b/stream/stream.h index a9b2c9a5fc..259c4736e9 100644 --- a/stream/stream.h +++ b/stream/stream.h @@ -1,5 +1,5 @@ -#ifndef __STREAM_H -#define __STREAM_H +#ifndef STREAM_H +#define STREAM_H #include "mp_msg.h" #include @@ -312,4 +312,4 @@ typedef struct { int channels; } stream_language_t; -#endif // __STREAM_H +#endif // STREAM_H diff --git a/stream/stream_dvdnav.h b/stream/stream_dvdnav.h index 7f631538b6..6bc94227fd 100644 --- a/stream/stream_dvdnav.h +++ b/stream/stream_dvdnav.h @@ -1,5 +1,5 @@ -#ifndef _MPLAYER_DVDNAV_STREAM_H -#define _MPLAYER_DVDNAV_STREAM_H +#ifndef MPLAYER_STREAM_DVDNAV_H +#define MPLAYER_STREAM_DVDNAV_H #include diff --git a/stream/stream_radio.h b/stream/stream_radio.h index 2d5ffb2cc4..5dc35ecd0b 100644 --- a/stream/stream_radio.h +++ b/stream/stream_radio.h @@ -1,5 +1,5 @@ -#ifndef _H_STREAM_RADIO_ -#define _H_STREAM_RADIO_ +#ifndef STREAM_RADIO_H +#define STREAM_RADIO_H #ifdef USE_RADIO #define RADIO_CHANNEL_LOWER 1 diff --git a/stream/tcp.h b/stream/tcp.h index 77aac33acc..7299f20fc3 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 TCP_H +#define 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 /* TCP_H */ diff --git a/stream/udp.h b/stream/udp.h index b908ea4fd1..75de24703d 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 UDP_H +#define UDP_H int udp_open_socket (URL_t *url); -#endif /* _UDP_H_ */ +#endif /* UDP_H */ diff --git a/stream/url.h b/stream/url.h index 1c2db9191a..4711dbeb4e 100644 --- a/stream/url.h +++ b/stream/url.h @@ -4,10 +4,10 @@ * (C) 2001, MPlayer team. */ -#ifndef __URL_H -#define __URL_H +#ifndef URL_H +#define URL_H -//#define __URL_DEBUG +//#define URL_DEBUG typedef struct { char *url; @@ -26,8 +26,8 @@ void url_free(URL_t* url); void url_unescape_string(char *outbuf, const char *inbuf); void url_escape_string(char *outbuf, const char *inbuf); -#ifdef __URL_DEBUG +#ifdef URL_DEBUG void url_debug(const URL_t* url); -#endif // __URL_DEBUG +#endif /* URL_DEBUG */ -#endif // __URL_H +#endif /* URL_H */ -- cgit v1.2.3