diff options
103 files changed, 241 insertions, 239 deletions
@@ -1,6 +1,6 @@ -#ifndef __GUI_APP_H -#define __GUI_APP_H +#ifndef GUI_APP_H +#define GUI_APP_H #include "bitmap.h" #include "wm/ws.h" diff --git a/gui/bitmap.h b/gui/bitmap.h index 3661a29667..0e5a455ac5 100644 --- a/gui/bitmap.h +++ b/gui/bitmap.h @@ -1,5 +1,5 @@ -#ifndef __GUI_BITMAP_H -#define __GUI_BITMAP_H +#ifndef GUI_BITMAP_H +#define GUI_BITMAP_H typedef struct _txSample { @@ -13,4 +13,4 @@ typedef struct _txSample int bpRead( char * fname, txSample * bf ); void Convert32to1( txSample * in,txSample * out,int adaptivlimit ); -#endif /* __GUI_BITMAP_H */ +#endif /* GUI_BITMAP_H */ @@ -1,6 +1,6 @@ -#ifndef __GUI_CFG_H -#define __GUI_CFG_H +#ifndef GUI_CFG_H +#define GUI_CFG_H extern int gtkEnableAudioEqualizer; diff --git a/gui/interface.h b/gui/interface.h index 4c5ed2bb7a..c6cbe4fe4d 100644 --- a/gui/interface.h +++ b/gui/interface.h @@ -1,6 +1,6 @@ -#ifndef _GUI_INTERFACE_H -#define _GUI_INTERFACE_H +#ifndef GUI_INTERFACE_H +#define GUI_INTERFACE_H #include "../config.h" #include "mplayer/play.h" diff --git a/gui/mplayer/common.h b/gui/mplayer/common.h index 3353a41a70..0f015805f0 100644 --- a/gui/mplayer/common.h +++ b/gui/mplayer/common.h @@ -1,5 +1,6 @@ -#ifndef __GUI_COMMON_H -#define __GUI_COMMON_H + +#ifndef GUI_COMMON_H +#define GUI_COMMON_H #include <stdlib.h> #include <stdio.h> diff --git a/gui/mplayer/gmplayer.h b/gui/mplayer/gmplayer.h index caa9297532..ad62b5c1b8 100644 --- a/gui/mplayer/gmplayer.h +++ b/gui/mplayer/gmplayer.h @@ -1,6 +1,6 @@ -#ifndef __GUI_GMPLAYER_H -#define __GUI_GMPLAYER_H +#ifndef GUI_GMPLAYER_H +#define GUI_GMPLAYER_H extern int mplSubRender; extern int mplMainRender; diff --git a/gui/mplayer/gtk/about.h b/gui/mplayer/gtk/about.h index 66d5f147ae..0fc2495a7c 100644 --- a/gui/mplayer/gtk/about.h +++ b/gui/mplayer/gtk/about.h @@ -1,6 +1,6 @@ -#ifndef __GUI_ABOUT_H -#define __GUI_ABOUT_H +#ifndef GUI_ABOUT_H +#define GUI_ABOUT_H #include <gtk/gtk.h> diff --git a/gui/mplayer/gtk/common.h b/gui/mplayer/gtk/common.h index 6547b27119..d8df6234cb 100644 --- a/gui/mplayer/gtk/common.h +++ b/gui/mplayer/gtk/common.h @@ -1,6 +1,6 @@ -#ifndef __GUI_COMMON_H -#define __GUI_COMMON_H +#ifndef GUI_COMMON_H +#define GUI_COMMON_H #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> diff --git a/gui/mplayer/gtk/eq.h b/gui/mplayer/gtk/eq.h index 99941a0509..599cd3a3a0 100644 --- a/gui/mplayer/gtk/eq.h +++ b/gui/mplayer/gtk/eq.h @@ -1,6 +1,6 @@ -#ifndef __GUI_EQ_H -#define __GUI_EQ_H +#ifndef GUI_EQ_H +#define GUI_EQ_H #include <gtk/gtk.h> diff --git a/gui/mplayer/gtk/fs.h b/gui/mplayer/gtk/fs.h index 94e9ff08e8..078a52e44b 100644 --- a/gui/mplayer/gtk/fs.h +++ b/gui/mplayer/gtk/fs.h @@ -1,5 +1,5 @@ -#ifndef __GUI_FS_H -#define __GUI_FS_H +#ifndef GUI_FS_H +#define GUI_FS_H #include <gtk/gtk.h> diff --git a/gui/mplayer/gtk/mb.h b/gui/mplayer/gtk/mb.h index d9aed53b70..85021d52b5 100644 --- a/gui/mplayer/gtk/mb.h +++ b/gui/mplayer/gtk/mb.h @@ -1,6 +1,6 @@ -#ifndef __GUI_MB_H -#define __GUI_MB_H +#ifndef GUI_MB_H +#define GUI_MB_H #include <gtk/gtk.h> diff --git a/gui/mplayer/gtk/menu.h b/gui/mplayer/gtk/menu.h index a8bc5bcc5b..b81cdd2df8 100644 --- a/gui/mplayer/gtk/menu.h +++ b/gui/mplayer/gtk/menu.h @@ -1,5 +1,5 @@ -#ifndef __GUI_MENU_H -#define __GUI_MENU_H +#ifndef GUI_MENU_H +#define GUI_MENU_H #include <gtk/gtk.h> diff --git a/gui/mplayer/gtk/opts.h b/gui/mplayer/gtk/opts.h index 4305938017..3ef572e2c8 100644 --- a/gui/mplayer/gtk/opts.h +++ b/gui/mplayer/gtk/opts.h @@ -1,6 +1,6 @@ -#ifndef __GUI_OPTS_H -#define __GUI_OPTS_H +#ifndef GUI_OPTS_H +#define GUI_OPTS_H #include <gtk/gtk.h> diff --git a/gui/mplayer/gtk/pl.h b/gui/mplayer/gtk/pl.h index d5e1ebe8b4..9c38b1062a 100644 --- a/gui/mplayer/gtk/pl.h +++ b/gui/mplayer/gtk/pl.h @@ -1,6 +1,6 @@ -#ifndef __GUI_PL_H -#define __GUI_PL_H +#ifndef GUI_PL_H +#define GUI_PL_H #include <gtk/gtk.h> diff --git a/gui/mplayer/gtk/sb.h b/gui/mplayer/gtk/sb.h index 74a28ab5a8..6b3b8323f4 100644 --- a/gui/mplayer/gtk/sb.h +++ b/gui/mplayer/gtk/sb.h @@ -1,5 +1,5 @@ -#ifndef __GUI_SB_H -#define __GUI_SB_H +#ifndef GUI_SB_H +#define GUI_SB_H #include <gtk/gtk.h> diff --git a/gui/mplayer/gtk/url.h b/gui/mplayer/gtk/url.h index 15b8914b72..4746cdc484 100644 --- a/gui/mplayer/gtk/url.h +++ b/gui/mplayer/gtk/url.h @@ -1,6 +1,6 @@ -#ifndef _GUI_URL_H -#define _GUI_URL_H +#ifndef GUI_URL_H +#define GUI_URL_H extern GtkWidget * URL; extern int gtkVURLDialogBox; diff --git a/gui/mplayer/play.h b/gui/mplayer/play.h index 15615dd8a2..4cb158021f 100644 --- a/gui/mplayer/play.h +++ b/gui/mplayer/play.h @@ -1,6 +1,6 @@ -#ifndef __GUI_PLAY_H -#define __GUI_PLAY_H +#ifndef GUI_PLAY_H +#define GUI_PLAY_H #include "../config.h" diff --git a/gui/mplayer/widgets.h b/gui/mplayer/widgets.h index 4c1c179c78..a13bb84abe 100644 --- a/gui/mplayer/widgets.h +++ b/gui/mplayer/widgets.h @@ -1,6 +1,6 @@ -#ifndef __GUI_WIDGETS_H -#define __GUI_WIDGETS_H +#ifndef GUI_WIDGETS_H +#define GUI_WIDGETS_H #include <stdio.h> #include <stdlib.h> diff --git a/gui/skin/cut.h b/gui/skin/cut.h index 1283c75c5b..f351f66311 100644 --- a/gui/skin/cut.h +++ b/gui/skin/cut.h @@ -1,6 +1,6 @@ -#ifndef _GUI_CUT_H -#define _GUI_CUT_H +#ifndef GUI_CUT_H +#define GUI_CUT_H extern void cutItem( char * in,char * out,char sep,int num ); extern int cutItemToInt( char * in,char sep,int num ); diff --git a/gui/skin/font.h b/gui/skin/font.h index 461b291339..0990f64953 100644 --- a/gui/skin/font.h +++ b/gui/skin/font.h @@ -1,6 +1,6 @@ -#ifndef _GUI_FONT_H -#define _GUI_FONT_H +#ifndef GUI_FONT_H +#define GUI_FONT_H #include "bitmap.h" #include "app.h" diff --git a/gui/skin/skin.h b/gui/skin/skin.h index 2dfd461c6f..87693d2e51 100644 --- a/gui/skin/skin.h +++ b/gui/skin/skin.h @@ -1,6 +1,6 @@ -#ifndef __GUI_SKIN_H -#define __GUI_SKIN_H +#ifndef GUI_SKIN_H +#define GUI_SKIN_H #include "app.h" diff --git a/gui/win32/dialogs.h b/gui/win32/dialogs.h index ba611c97e3..48433d2c1b 100644 --- a/gui/win32/dialogs.h +++ b/gui/win32/dialogs.h @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _GUI_DIALOGS_H -#define _GUI_DIALOGS_H +#ifndef GUI_DIALOGS_H +#define GUI_DIALOGS_H #define TBS_TOOLTIPS 0x0100 #define WM_SYSTRAY (WM_USER+1) diff --git a/gui/win32/gui.h b/gui/win32/gui.h index f6fb98059c..4c98815caf 100644 --- a/gui/win32/gui.h +++ b/gui/win32/gui.h @@ -21,8 +21,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _GUI_GUI_H -#define _GUI_GUI_H +#ifndef GUI_GUI_H +#define GUI_GUI_H + #include "config.h" #include "mplayer.h" #include "playtree.h" diff --git a/gui/win32/playlist.h b/gui/win32/playlist.h index a534a7f77a..09d10a3bb4 100644 --- a/gui/win32/playlist.h +++ b/gui/win32/playlist.h @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _GUI_PLAYLIST_H -#define _GUI_PLAYLIST_H +#ifndef GUI_PLAYLIST_H +#define GUI_PLAYLIST_H typedef struct { diff --git a/gui/win32/skinload.h b/gui/win32/skinload.h index 2ac0cd6fd8..33b59ef996 100644 --- a/gui/win32/skinload.h +++ b/gui/win32/skinload.h @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _GUI_SKINLOAD_H -#define _GUI_SKINLOAD_H +#ifndef GUI_SKINLOAD_H +#define GUI_SKINLOAD_H typedef struct { diff --git a/gui/win32/wincfg.h b/gui/win32/wincfg.h index bddb41988c..6d00c2ac8a 100644 --- a/gui/win32/wincfg.h +++ b/gui/win32/wincfg.h @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _GUI_WINCFG_H -#define _GUI_WINCFG_H +#ifndef GUI_WINCFG_H +#define GUI_WINCFG_H extern char *skinName; extern int sub_window; diff --git a/gui/wm/ws.h b/gui/wm/ws.h index 25d77f0da3..1ab540263e 100644 --- a/gui/wm/ws.h +++ b/gui/wm/ws.h @@ -4,8 +4,8 @@ // Writed by pontscho / fresh!mindworkz // ---------------------------------------------------------------------------------------------- -#ifndef __GUI_WS_H -#define __GUI_WS_H +#ifndef GUI_WS_H +#define GUI_WS_H #include <X11/Xlib.h> #include <X11/Xutil.h> diff --git a/gui/wm/wskeys.h b/gui/wm/wskeys.h index 8ffdb6ca21..7e8d42030c 100644 --- a/gui/wm/wskeys.h +++ b/gui/wm/wskeys.h @@ -1,6 +1,6 @@ -#ifndef _GUI_WSKEYS_H -#define _GUI_WSKEYS_H +#ifndef GUI_WSKEYS_H +#define GUI_WSKEYS_H #define wsKeyNone -1 diff --git a/gui/wm/wsxdnd.h b/gui/wm/wsxdnd.h index 4e400d030a..d44ce82dd3 100644 --- a/gui/wm/wsxdnd.h +++ b/gui/wm/wsxdnd.h @@ -1,6 +1,6 @@ -#ifndef _GUI_WSXDND_H -#define _GUI_WSXDND_H +#ifndef GUI_WSXDND_H +#define GUI_WSXDND_H void wsXDNDInitialize(void); diff --git a/libaf/dsp.h b/libaf/dsp.h index bee34a45db..f476ff3d2d 100644 --- a/libaf/dsp.h +++ b/libaf/dsp.h @@ -8,8 +8,8 @@ //============================================================================= */ -#ifndef _DSP_H -#define _DSP_H 1 +#ifndef DSP_H +#define DSP_H /* Implementation of routines used for DSP */ diff --git a/libaf/filter.h b/libaf/filter.h index 9b882c85d2..ad5798a94a 100644 --- a/libaf/filter.h +++ b/libaf/filter.h @@ -8,12 +8,12 @@ //============================================================================= */ -#if !defined _DSP_H +#if !defined DSP_H # error "Never use <filter.h> directly; include <dsp.h> instead" #endif -#ifndef _FILTER_H -#define _FILTER_H 1 +#ifndef FILTER_H +#define FILTER_H // Design and implementation of different types of digital filters diff --git a/libaf/window.h b/libaf/window.h index 000dda6766..03a0dccab7 100644 --- a/libaf/window.h +++ b/libaf/window.h @@ -15,12 +15,12 @@ coefficients will be stored. */ -#if !defined _DSP_H +#if !defined DSP_H # error "Never use <window.h> directly; include <dsp.h> instead" #endif -#ifndef _WINDOW_H -#define _WINDOW_H 1 +#ifndef WINDOW_H +#define WINDOW_H extern void af_window_boxcar(int n, _ftype_t* w); extern void af_window_triang(int n, _ftype_t* w); diff --git a/libao2/audio_out.h b/libao2/audio_out.h index e5ae6b4e59..ef10dc6c95 100644 --- a/libao2/audio_out.h +++ b/libao2/audio_out.h @@ -1,6 +1,6 @@ -#ifndef __AUDIO_OUT_H -#define __AUDIO_OUT_H +#ifndef AUDIO_OUT_H +#define AUDIO_OUT_H typedef struct ao_info_s { diff --git a/libass/ass.h b/libass/ass.h index fb66b20420..e20e6bb175 100644 --- a/libass/ass.h +++ b/libass/ass.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __ASS_H__ -#define __ASS_H__ +#ifndef ASS_H +#define ASS_H #include "ass_types.h" diff --git a/libass/ass_bitmap.h b/libass/ass_bitmap.h index ba5867f7cc..3394ab2d52 100644 --- a/libass/ass_bitmap.h +++ b/libass/ass_bitmap.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __ASS_BITMAP_H__ -#define __ASS_BITMAP_H__ +#ifndef ASS_BITMAP_H +#define ASS_BITMAP_H typedef struct ass_synth_priv_s ass_synth_priv_t; diff --git a/libass/ass_cache.h b/libass/ass_cache.h index caa750a54f..c601caf6c0 100644 --- a/libass/ass_cache.h +++ b/libass/ass_cache.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __ASS_CACHE_H__ -#define __ASS_CACHE_H__ +#ifndef ASS_CACHE_H +#define ASS_CACHE_H void ass_font_cache_init(void); ass_font_t* ass_font_cache_find(ass_font_desc_t* desc); diff --git a/libass/ass_font.h b/libass/ass_font.h index 85c0218bd8..6d10ad18db 100644 --- a/libass/ass_font.h +++ b/libass/ass_font.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __ASS_FONT_H__ -#define __ASS_FONT_H__ +#ifndef ASS_FONT_H +#define ASS_FONT_H #ifdef HAVE_FONTCONFIG #include <fontconfig/fontconfig.h> diff --git a/libass/ass_fontconfig.h b/libass/ass_fontconfig.h index a296bcef3e..30cd30dbf4 100644 --- a/libass/ass_fontconfig.h +++ b/libass/ass_fontconfig.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __ASS_FONTCONFIG_H__ -#define __ASS_FONTCONFIG_H__ +#ifndef ASS_FONTCONFIG_H +#define ASS_FONTCONFIG_H #ifdef HAVE_FONTCONFIG #include <fontconfig/fontconfig.h> diff --git a/libass/ass_library.h b/libass/ass_library.h index 34a8b7a034..4cebe42e43 100644 --- a/libass/ass_library.h +++ b/libass/ass_library.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __ASS_LIBRARY_H__ -#define __ASS_LIBRARY_H__ +#ifndef ASS_LIBRARY_H +#define ASS_LIBRARY_H typedef struct ass_fontdata_s { char* name; diff --git a/libass/ass_mp.h b/libass/ass_mp.h index 5439a76001..c5541465ae 100644 --- a/libass/ass_mp.h +++ b/libass/ass_mp.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __ASS_MP_H__ -#define __ASS_MP_H__ +#ifndef ASS_MP_H +#define ASS_MP_H #include "subreader.h" diff --git a/libass/ass_types.h b/libass/ass_types.h index 0795d56371..e0c71a96a7 100644 --- a/libass/ass_types.h +++ b/libass/ass_types.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __ASS_TYPES_H__ -#define __ASS_TYPES_H__ +#ifndef ASS_TYPES_H +#define ASS_TYPES_H #define VALIGN_SUB 0 #define VALIGN_CENTER 8 diff --git a/libass/ass_utils.h b/libass/ass_utils.h index 53b4b4f96a..5e2adecdfa 100644 --- a/libass/ass_utils.h +++ b/libass/ass_utils.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __ASS_UTILS_H__ -#define __ASS_UTILS_H__ +#ifndef ASS_UTILS_H +#define ASS_UTILS_H int mystrtoi(char** p, int base, int* res); int mystrtou32(char** p, int base, uint32_t* res); diff --git a/libass/mputils.h b/libass/mputils.h index 5ed1be527e..ef7c8e4fe6 100644 --- a/libass/mputils.h +++ b/libass/mputils.h @@ -1,5 +1,5 @@ -#ifndef __ASS_MPUTILS_H__ -#define __ASS_MPUTILS_H__ +#ifndef ASS_MPUTILS_H +#define ASS_MPUTILS_H #include "mp_msg.h" #include "help_mp.h" 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) --------- diff --git a/libmpdemux/asf.h b/libmpdemux/asf.h index 7dbc900bca..2252953755 100644 --- a/libmpdemux/asf.h +++ b/libmpdemux/asf.h @@ -1,5 +1,5 @@ -#ifndef __ASF_H -#define __ASF_H +#ifndef ASF_H +#define ASF_H //#include "config.h" /* for WORDS_BIGENDIAN */ #include <inttypes.h> diff --git a/libmpdemux/aviheader.h b/libmpdemux/aviheader.h index e47356c97b..ef75a6c7df 100644 --- a/libmpdemux/aviheader.h +++ b/libmpdemux/aviheader.h @@ -1,5 +1,5 @@ -#ifndef _aviheader_h -#define _aviheader_h +#ifndef AVIHEADER_H +#define AVIHEADER_H //#include "config.h" /* get correct definition WORDS_BIGENDIAN */ #include "libavutil/common.h" diff --git a/libmpdemux/demux_rtp.h b/libmpdemux/demux_rtp.h index 8d8277bad0..cffd3d9d85 100644 --- a/libmpdemux/demux_rtp.h +++ b/libmpdemux/demux_rtp.h @@ -1,13 +1,13 @@ -#ifndef _DEMUX_RTP_H -#define _DEMUX_RTP_H +#ifndef DEMUX_RTP_H +#define DEMUX_RTP_H #include <stdlib.h> #include <stdio.h> -#ifndef __STREAM_H +#ifndef STREAM_H #include "stream/stream.h" #endif -#ifndef __DEMUXER_H +#ifndef DEMUXER_H #include "demuxer.h" #endif diff --git a/libmpdemux/demux_rtp_internal.h b/libmpdemux/demux_rtp_internal.h index 4602da3a86..321e9f09e9 100644 --- a/libmpdemux/demux_rtp_internal.h +++ b/libmpdemux/demux_rtp_internal.h @@ -1,13 +1,13 @@ -#ifndef _DEMUX_RTP_INTERNAL_H -#define _DEMUX_RTP_INTERNAL_H +#ifndef DEMUX_RTP_INTERNAL_H +#define DEMUX_RTP_INTERNAL_H #include <stdlib.h> extern "C" { -#ifndef __STREAM_H +#ifndef STREAM_H #include "stream/stream.h" #endif -#ifndef __DEMUXER_H +#ifndef DEMUXER_H #include "demuxer.h" #endif #ifdef USE_LIBAVCODEC_SO diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index 73b6bc5194..ecba6b71ca 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -1,5 +1,5 @@ -#ifndef __DEMUXER_H -#define __DEMUXER_H 1 +#ifndef DEMUXER_H +#define DEMUXER_H #ifdef USE_ASS #include "libass/ass_types.h" @@ -387,4 +387,4 @@ int demuxer_add_chapter(demuxer_t* demuxer, const char* name, uint64_t start, ui int demuxer_seek_chapter(demuxer_t *demuxer, int chapter, int mode, float *seek_pts, int *num_chapters, char **chapter_name); -#endif /* __DEMUXER_H */ +#endif /* DEMUXER_H */ diff --git a/libmpdemux/ebml.h b/libmpdemux/ebml.h index 6f32d73c49..967bffa118 100644 --- a/libmpdemux/ebml.h +++ b/libmpdemux/ebml.h @@ -1,5 +1,5 @@ -#ifndef __EBML_H -#define __EBML_H +#ifndef EBML_H +#define EBML_H #include <inttypes.h> @@ -188,4 +188,4 @@ int ebml_read_skip (stream_t *s, uint64_t *length); uint32_t ebml_read_master (stream_t *s, uint64_t *length); char *ebml_read_header (stream_t *s, int *version); -#endif /* __EBML_H */ +#endif /* EBML_H */ diff --git a/libmpdemux/genres.h b/libmpdemux/genres.h index 45c43d9ecf..3548c26180 100644 --- a/libmpdemux/genres.h +++ b/libmpdemux/genres.h @@ -14,8 +14,8 @@ */ -#ifndef _GENRES_H -#define _GENRES_H +#ifndef GENRES_H +#define GENRES_H char *genres[] = { @@ -278,4 +278,4 @@ char *genres[] = { }; -#endif /* _GENRES_H */ +#endif /* GENRES_H */ diff --git a/libmpdemux/matroska.h b/libmpdemux/matroska.h index e88faad275..0367925ec8 100644 --- a/libmpdemux/matroska.h +++ b/libmpdemux/matroska.h @@ -4,8 +4,8 @@ * see http://cvs.corecodec.org/cgi-bin/cvsweb.cgi/~checkout~/matroska/doc/website/specs/codex.html?rev=HEAD&content-type=text/html */ -#ifndef __MATROSKA_H -#define __MATROSKA_H +#ifndef MATROSKA_H +#define MATROSKA_H #define MKV_A_AAC_2MAIN "A_AAC/MPEG2/MAIN" #define MKV_A_AAC_2LC "A_AAC/MPEG2/LC" @@ -66,4 +66,4 @@ void demux_mkv_get_audio_lang(demuxer_t *demuxer, int track_num, char *lang, void demux_mkv_get_sub_lang(demuxer_t *demuxer, int track_num, char *lang, int maxlen); -#endif /* __MATROSKA_H */ +#endif /* MATROSKA_H */ diff --git a/libmpdemux/mf.h b/libmpdemux/mf.h index b288063a28..6022ee12b9 100644 --- a/libmpdemux/mf.h +++ b/libmpdemux/mf.h @@ -1,6 +1,6 @@ -#ifndef _MF_H -#define _MF_H +#ifndef MF_H +#define MF_H extern int mf_w; extern int mf_h; diff --git a/libmpdemux/mpeg_packetizer.h b/libmpdemux/mpeg_packetizer.h index 969c2f1133..6a17034f1f 100644 --- a/libmpdemux/mpeg_packetizer.h +++ b/libmpdemux/mpeg_packetizer.h @@ -22,8 +22,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _MPEG_PACKETIZER_H_ -#define _MPEG_PACKETIZER_H_ +#ifndef MPEG_PACKETIZER_H +#define MPEG_PACKETIZER_H /* Send MPEG <type> PES packet */ int send_mpeg_pes_packet (unsigned char *data, int len, int id, uint64_t pts, @@ -38,4 +38,4 @@ int send_mpeg_lpcm_packet (unsigned char *data, int len, int id, uint64_t pts, int freq_id, int my_write (unsigned char *data, int len)); -#endif /* _MPEG_PACKETIZER_H_ */ +#endif /* MPEG_PACKETIZER_H */ diff --git a/libmpdemux/ms_hdr.h b/libmpdemux/ms_hdr.h index 90ee7e82e5..3ca0179ddc 100644 --- a/libmpdemux/ms_hdr.h +++ b/libmpdemux/ms_hdr.h @@ -1,5 +1,5 @@ -#ifndef __MS_HDR_H -#define __MS_HDR_H +#ifndef MS_HDR_H +#define MS_HDR_H #ifndef _WAVEFORMATEX_ #define _WAVEFORMATEX_ diff --git a/libmpdemux/parse_mp4.h b/libmpdemux/parse_mp4.h index 5fbb3422e3..6bd404c51b 100644 --- a/libmpdemux/parse_mp4.h +++ b/libmpdemux/parse_mp4.h @@ -4,8 +4,8 @@ * File licensed under the GPL, see http://www.fsf.org/ for more info. */ -#ifndef __PARSE_MP4_H -#define __PARSE_MP4_H 1 +#ifndef PARSE_MP4_H +#define PARSE_MP4_H #include <inttypes.h> @@ -107,5 +107,5 @@ typedef struct { int mp4_parse_esds(unsigned char *data, int datalen, esds_t *esds); void mp4_free_esds(esds_t *esds); -#endif /* !__PARSE_MP4_H */ +#endif /* !PARSE_MP4_H */ diff --git a/libmpdemux/stheader.h b/libmpdemux/stheader.h index 8c1a05e46d..3bd3725f1f 100644 --- a/libmpdemux/stheader.h +++ b/libmpdemux/stheader.h @@ -1,5 +1,5 @@ -#ifndef __STHEADER_H__ -#define __STHEADER_H__ +#ifndef STHEADER_H +#define STHEADER_H #include "aviheader.h" #include "ms_hdr.h" diff --git a/libmpdemux/yuv4mpeg.h b/libmpdemux/yuv4mpeg.h index 12e1249bc0..2db6136ce1 100644 --- a/libmpdemux/yuv4mpeg.h +++ b/libmpdemux/yuv4mpeg.h @@ -24,8 +24,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __YUV4MPEG_H__ -#define __YUV4MPEG_H__ +#ifndef YUV4MPEG_H +#define YUV4MPEG_H #include <stdlib.h> //#include "mp_msg.h" @@ -449,6 +449,6 @@ int y4m_allow_unknown_tags(int yn); ************************************************************************ ************************************************************************/ -#endif /* __YUV4MPEG_H__ */ +#endif /* YUV4MPEG_H */ diff --git a/libmpdemux/yuv4mpeg_intern.h b/libmpdemux/yuv4mpeg_intern.h index 0291e3a2bf..edf447509e 100644 --- a/libmpdemux/yuv4mpeg_intern.h +++ b/libmpdemux/yuv4mpeg_intern.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __YUV4MPEG_INTERN_H__ -#define __YUV4MPEG_INTERN_H__ +#ifndef YUV4MPEG_INTERN_H +#define YUV4MPEG_INTERN_H #define Y4M_MAGIC "YUV4MPEG2" @@ -75,4 +75,4 @@ #define Y4M_DAR_MPEG2_3 { 16, 9 } #define Y4M_DAR_MPEG2_4 { 221, 100 } -#endif /* __YUV4MPEG_INTERN_H__ */ +#endif /* YUV4MPEG_INTERN_H */ diff --git a/libvo/aspect.h b/libvo/aspect.h index e23b3445cf..de0a182397 100644 --- a/libvo/aspect.h +++ b/libvo/aspect.h @@ -1,5 +1,5 @@ -#ifndef __ASPECT_H -#define __ASPECT_H +#ifndef ASPECT_H +#define ASPECT_H /* Stuff for correct aspect scaling. */ extern int vo_panscan_x; diff --git a/libvo/fastmemcpy.h b/libvo/fastmemcpy.h index 582cdec851..a379a6f4bc 100644 --- a/libvo/fastmemcpy.h +++ b/libvo/fastmemcpy.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __FASTMEMCPY_H -#define __FASTMEMCPY_H +#ifndef FASTMEMCPY_H +#define FASTMEMCPY_H #include "config.h" #include <inttypes.h> diff --git a/libvo/font_load.h b/libvo/font_load.h index db427473d7..39242eab38 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 MPLAYER_FONT_LOAD_H +#define MPLAYER_FONT_LOAD_H #ifdef HAVE_FREETYPE #include <ft2build.h> @@ -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 /* ! MPLAYER_FONT_LOAD_H */ diff --git a/libvo/geometry.h b/libvo/geometry.h index fae10fc508..261ae4d64b 100644 --- a/libvo/geometry.h +++ b/libvo/geometry.h @@ -1,9 +1,9 @@ /* This file (C) Mark Zealey <mark@zealos.org 2002, released under GPL */ -#ifndef __GEOMETRY_H -#define __GEOMETRY_H +#ifndef GEOMETRY_H +#define GEOMETRY_H extern char *vo_geometry; extern int geometry_wh_changed; extern int geometry_xy_changed; int geometry(int *xpos, int *ypos, int *widw, int *widh, int scrw, int scrh); -#endif /* !__GEOMETRY_H */ +#endif /* !GEOMETRY_H */ diff --git a/libvo/gl_common.h b/libvo/gl_common.h index 927e887c6b..53ee8ef08d 100644 --- a/libvo/gl_common.h +++ b/libvo/gl_common.h @@ -1,5 +1,5 @@ -#ifndef __GL_COMMON_H__ -#define __GL_COMMON_H__ +#ifndef GL_COMMON_H +#define GL_COMMON_H #include "mp_msg.h" #include "config.h" diff --git a/libvo/gtf.h b/libvo/gtf.h index 1cedd1c3ef..aa51dc97a0 100644 --- a/libvo/gtf.h +++ b/libvo/gtf.h @@ -1,5 +1,5 @@ -#ifndef __GTF_H -#define __GTF_H +#ifndef GTF_H +#define GTF_H #include <vbe.h> diff --git a/libvo/osd.h b/libvo/osd.h index 36ff2e68d3..d1a744ad3b 100644 --- a/libvo/osd.h +++ b/libvo/osd.h @@ -1,6 +1,6 @@ -#ifndef __MPLAYER_OSD_H -#define __MPLAYER_OSD_H +#ifndef MPLAYER_OSD_H +#define MPLAYER_OSD_H // Generic alpha renderers for all YUV modes and RGB depths. // These are "reference implementations", should be optimized later (MMX, etc) diff --git a/libvo/sub.h b/libvo/sub.h index 3d36f1bb2d..e139607e21 100644 --- a/libvo/sub.h +++ b/libvo/sub.h @@ -1,6 +1,6 @@ -#ifndef __MPLAYER_SUB_H -#define __MPLAYER_SUB_H +#ifndef MPLAYER_SUB_H +#define MPLAYER_SUB_H typedef struct mp_osd_bbox_s { int x1,y1,x2,y2; diff --git a/libvo/vesa_lvo.h b/libvo/vesa_lvo.h index 7ef6e4aead..22991bd02b 100644 --- a/libvo/vesa_lvo.h +++ b/libvo/vesa_lvo.h @@ -9,8 +9,8 @@ * This file contains vo_vesa interface to Linux Video Overlay. */ -#ifndef __VESA_LVO_H -#define __VESA_LVO_H +#ifndef VESA_LVO_H +#define VESA_LVO_H int vlvo_preinit(const char *drvname); int vlvo_init(unsigned src_width,unsigned src_height, diff --git a/libvo/video_out.h b/libvo/video_out.h index d8515665de..eb1e6fe13f 100644 --- a/libvo/video_out.h +++ b/libvo/video_out.h @@ -7,8 +7,8 @@ * */ -#ifndef __VIDEO_OUT_H -#define __VIDEO_OUT_H 1 +#ifndef VIDEO_OUT_H +#define VIDEO_OUT_H #include <inttypes.h> #include <stdarg.h> diff --git a/libvo/vosub_vidix.h b/libvo/vosub_vidix.h index d129995675..022605cb92 100644 --- a/libvo/vosub_vidix.h +++ b/libvo/vosub_vidix.h @@ -9,8 +9,8 @@ * This file contains vosub_vidix interface to any mplayer's VO driver */ -#ifndef __VOSUB_VIDIX_H -#define __VOSUB_VIDIX_H +#ifndef VOSUB_VIDIX_H +#define VOSUB_VIDIX_H /* drvname can be NULL */ int vidix_preinit(const char *drvname,void *server); diff --git a/libvo/wskeys.h b/libvo/wskeys.h index 6c2c5db264..65dd06541d 100644 --- a/libvo/wskeys.h +++ b/libvo/wskeys.h @@ -1,6 +1,6 @@ -#ifndef _WSKEYS_H -#define _WSKEYS_H +#ifndef WSKEYS_H +#define WSKEYS_H #define wsosbrackets '[' #define wscsbrackets ']' diff --git a/m_config.h b/m_config.h index 88a6e76e9f..7b4a8db2ee 100644 --- a/m_config.h +++ b/m_config.h @@ -1,5 +1,5 @@ -#ifndef _M_CONFIG_H -#define _M_CONFIG_H +#ifndef M_CONFIG_H +#define M_CONFIG_H /// \defgroup Config Config manager /// @@ -197,4 +197,4 @@ m_config_set_profile_option(m_config_t* config, m_profile_t* p, ///@} -#endif /* _M_CONFIG_H */ +#endif /* M_CONFIG_H */ diff --git a/m_option.h b/m_option.h index 3b37fa1cd4..569b9a9b05 100644 --- a/m_option.h +++ b/m_option.h @@ -1,5 +1,5 @@ -#ifndef _M_OPTION_H -#define _M_OPTION_H +#ifndef M_OPTION_H +#define M_OPTION_H /// \defgroup Options /// m_option allows to parse, print and copy data of various types. @@ -500,4 +500,4 @@ m_option_free(m_option_t* opt,void* dst) { /*@}*/ -#endif /* _M_OPTION_H */ +#endif /* M_OPTION_H */ diff --git a/m_struct.h b/m_struct.h index 99a7dc3768..9c1bb82757 100644 --- a/m_struct.h +++ b/m_struct.h @@ -1,5 +1,5 @@ -#ifndef _M_STRUCT_H -#define _M_STRUCT_H +#ifndef M_STRUCT_H +#define M_STRUCT_H /// \defgroup OptionsStruct Options struct /// \ingroup Options @@ -105,4 +105,4 @@ m_struct_get_field(m_struct_t* st,const char* f); ///@} -#endif /* _M_STRUCT_H */ +#endif /* M_STRUCT_H */ @@ -4,8 +4,8 @@ * File licensed under the GPL, see http://www.fsf.org/ for more info. */ -#ifndef __MANGLE_H -#define __MANGLE_H +#ifndef MANGLE_H +#define MANGLE_H /* Feel free to add more to the list, eg. a.out IMO */ #if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__OS2__) || \ @@ -15,5 +15,5 @@ #define MANGLE(a) #a #endif -#endif /* !__MANGLE_H */ +#endif /* !MANGLE_H */ diff --git a/metadata.h b/metadata.h index 9acaab3eff..5c0451b04c 100644 --- a/metadata.h +++ b/metadata.h @@ -17,8 +17,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _METADATA_H_ -#define _METADATA_H_ +#ifndef METADATA_H +#define METADATA_H typedef enum metadata_s metadata_t; enum metadata_s { @@ -47,5 +47,5 @@ enum metadata_s { char *get_metadata (metadata_t type); -#endif /* _METADATA_H_ */ +#endif /* METADATA_H */ @@ -1,6 +1,6 @@ -#ifndef _MP_MSG_H -#define _MP_MSG_H +#ifndef MP_MSG_H +#define MP_MSG_H // defined in mplayer.c and mencoder.c extern int verbose; diff --git a/playtree.h b/playtree.h index 9876bb64a0..86193a7d9f 100644 --- a/playtree.h +++ b/playtree.h @@ -2,8 +2,8 @@ /// \file /// \ingroup Playtree -#ifndef __PLAYTREE_H -#define __PLAYTREE_H +#ifndef PLAYTREE_H +#define PLAYTREE_H struct stream_st; struct m_config; diff --git a/playtreeparser.h b/playtreeparser.h index a8bcf1dbd7..22e299dfc2 100644 --- a/playtreeparser.h +++ b/playtreeparser.h @@ -8,8 +8,8 @@ /// \file -#ifndef __PLAYTREEPARSER_H -#define __PLAYTREEPARSER_H +#ifndef PLAYTREEPARSER_H +#define PLAYTREEPARSER_H struct stream_st; @@ -1,5 +1,5 @@ -#ifndef _MPLAYER_SPUDEC_H -#define _MPLAYER_SPUDEC_H +#ifndef MPLAYER_SPUDEC_H +#define MPLAYER_SPUDEC_H #include "libvo/video_out.h" 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 <mplayer@davel.me.uk> */ -#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 <fcntl.h> #include <sys/time.h> 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 <string.h> @@ -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 <dvdnav.h> 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 */ diff --git a/subreader.h b/subreader.h index aab057be31..225761572b 100644 --- a/subreader.h +++ b/subreader.h @@ -1,5 +1,5 @@ -#ifndef __MPLAYER_SUBREADER_H -#define __MPLAYER_SUBREADER_H +#ifndef MPLAYER_SUBREADER_H +#define MPLAYER_SUBREADER_H #include <stdio.h> diff --git a/xvid_vbr.h b/xvid_vbr.h index 48cfaad933..df56d13e57 100644 --- a/xvid_vbr.h +++ b/xvid_vbr.h @@ -23,8 +23,8 @@ * *****************************************************************************/ -#ifndef __XVID_VBR_H__ -#define __XVID_VBR_H__ +#ifndef XVID_VBR_H +#define XVID_VBR_H #define VBR_VERSION 0 |