Tue Jul 3 00:34:45 CEST 2007

Author: diego
Date: Tue Jul  3 00:34:45 2007
New Revision: 23709

Log:
Do not use leading underscores in multiple inclusion guards, they are reserved.


Modified:
   trunk/gui/app.h
   trunk/gui/bitmap.h
   trunk/gui/cfg.h
   trunk/gui/interface.h
   trunk/gui/mplayer/common.h
   trunk/gui/mplayer/gmplayer.h
   trunk/gui/mplayer/gtk/about.h
   trunk/gui/mplayer/gtk/common.h
   trunk/gui/mplayer/gtk/eq.h
   trunk/gui/mplayer/gtk/fs.h
   trunk/gui/mplayer/gtk/mb.h
   trunk/gui/mplayer/gtk/menu.h
   trunk/gui/mplayer/gtk/opts.h
   trunk/gui/mplayer/gtk/pl.h
   trunk/gui/mplayer/gtk/sb.h
   trunk/gui/mplayer/gtk/url.h
   trunk/gui/mplayer/play.h
   trunk/gui/mplayer/widgets.h
   trunk/gui/skin/cut.h
   trunk/gui/skin/font.h
   trunk/gui/skin/skin.h
   trunk/gui/win32/dialogs.h
   trunk/gui/win32/gui.h
   trunk/gui/win32/playlist.h
   trunk/gui/win32/skinload.h
   trunk/gui/win32/wincfg.h
   trunk/gui/wm/ws.h
   trunk/gui/wm/wskeys.h
   trunk/gui/wm/wsxdnd.h
   trunk/libaf/dsp.h
   trunk/libaf/filter.h
   trunk/libaf/window.h
   trunk/libao2/audio_out.h
   trunk/libass/ass.h
   trunk/libass/ass_bitmap.h
   trunk/libass/ass_cache.h
   trunk/libass/ass_font.h
   trunk/libass/ass_fontconfig.h
   trunk/libass/ass_library.h
   trunk/libass/ass_mp.h
   trunk/libass/ass_types.h
   trunk/libass/ass_utils.h
   trunk/libass/mputils.h
   trunk/libmpcodecs/ae.h
   trunk/libmpcodecs/ae_lame.h
   trunk/libmpcodecs/ae_lavc.h
   trunk/libmpcodecs/ae_pcm.h
   trunk/libmpcodecs/cmmx.h
   trunk/libmpcodecs/img_format.h
   trunk/libmpcodecs/mp_image.h
   trunk/libmpdemux/asf.h
   trunk/libmpdemux/aviheader.h
   trunk/libmpdemux/demux_rtp.h
   trunk/libmpdemux/demux_rtp_internal.h
   trunk/libmpdemux/demuxer.h
   trunk/libmpdemux/ebml.h
   trunk/libmpdemux/genres.h
   trunk/libmpdemux/matroska.h
   trunk/libmpdemux/mf.h
   trunk/libmpdemux/mpeg_packetizer.h
   trunk/libmpdemux/ms_hdr.h
   trunk/libmpdemux/parse_mp4.h
   trunk/libmpdemux/stheader.h
   trunk/libmpdemux/yuv4mpeg.h
   trunk/libmpdemux/yuv4mpeg_intern.h
   trunk/libvo/aspect.h
   trunk/libvo/fastmemcpy.h
   trunk/libvo/font_load.h
   trunk/libvo/geometry.h
   trunk/libvo/gl_common.h
   trunk/libvo/gtf.h
   trunk/libvo/osd.h
   trunk/libvo/sub.h
   trunk/libvo/vesa_lvo.h
   trunk/libvo/video_out.h
   trunk/libvo/vosub_vidix.h
   trunk/libvo/wskeys.h
   trunk/m_config.h
   trunk/m_option.h
   trunk/m_struct.h
   trunk/mangle.h
   trunk/metadata.h
   trunk/mp_msg.h
   trunk/playtree.h
   trunk/playtreeparser.h
   trunk/spudec.h
   trunk/stream/audio_in.h
   trunk/stream/cache2.h
   trunk/stream/cdd.h
   trunk/stream/cookies.h
   trunk/stream/http.h
   trunk/stream/librtsp/rtsp_rtp.h
   trunk/stream/network.h
   trunk/stream/realrtsp/xbuffer.h
   trunk/stream/rtp.h
   trunk/stream/stream.h
   trunk/stream/stream_dvdnav.h
   trunk/stream/stream_radio.h
   trunk/stream/tcp.h
   trunk/stream/udp.h
   trunk/stream/url.h
   trunk/subreader.h
   trunk/xvid_vbr.h

Modified: trunk/gui/app.h
==============================================================================

--- trunk/gui/app.h	(original)
+++ trunk/gui/app.h	Tue Jul  3 00:34:45 2007
@@ -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"

Modified: trunk/gui/bitmap.h
==============================================================================
--- trunk/gui/bitmap.h	(original)
+++ trunk/gui/bitmap.h	Tue Jul  3 00:34:45 2007
@@ -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 */

Modified: trunk/gui/cfg.h
==============================================================================
--- trunk/gui/cfg.h	(original)
+++ trunk/gui/cfg.h	Tue Jul  3 00:34:45 2007
@@ -1,6 +1,6 @@
 
-#ifndef __GUI_CFG_H
-#define __GUI_CFG_H
+#ifndef GUI_CFG_H
+#define GUI_CFG_H
 
 extern int gtkEnableAudioEqualizer;
 

Modified: trunk/gui/interface.h
==============================================================================
--- trunk/gui/interface.h	(original)
+++ trunk/gui/interface.h	Tue Jul  3 00:34:45 2007
@@ -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"

Modified: trunk/gui/mplayer/common.h
==============================================================================
--- trunk/gui/mplayer/common.h	(original)
+++ trunk/gui/mplayer/common.h	Tue Jul  3 00:34:45 2007
@@ -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>

Modified: trunk/gui/mplayer/gmplayer.h
==============================================================================
--- trunk/gui/mplayer/gmplayer.h	(original)
+++ trunk/gui/mplayer/gmplayer.h	Tue Jul  3 00:34:45 2007
@@ -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;

Modified: trunk/gui/mplayer/gtk/about.h
==============================================================================
--- trunk/gui/mplayer/gtk/about.h	(original)
+++ trunk/gui/mplayer/gtk/about.h	Tue Jul  3 00:34:45 2007
@@ -1,6 +1,6 @@
 
-#ifndef __GUI_ABOUT_H
-#define __GUI_ABOUT_H
+#ifndef GUI_ABOUT_H
+#define GUI_ABOUT_H
 
 #include <gtk/gtk.h>
 

Modified: trunk/gui/mplayer/gtk/common.h
==============================================================================
--- trunk/gui/mplayer/gtk/common.h	(original)
+++ trunk/gui/mplayer/gtk/common.h	Tue Jul  3 00:34:45 2007
@@ -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>

Modified: trunk/gui/mplayer/gtk/eq.h
==============================================================================
--- trunk/gui/mplayer/gtk/eq.h	(original)
+++ trunk/gui/mplayer/gtk/eq.h	Tue Jul  3 00:34:45 2007
@@ -1,6 +1,6 @@
 
-#ifndef __GUI_EQ_H
-#define __GUI_EQ_H
+#ifndef GUI_EQ_H
+#define GUI_EQ_H
 
 #include <gtk/gtk.h>
 

Modified: trunk/gui/mplayer/gtk/fs.h
==============================================================================
--- trunk/gui/mplayer/gtk/fs.h	(original)
+++ trunk/gui/mplayer/gtk/fs.h	Tue Jul  3 00:34:45 2007
@@ -1,5 +1,5 @@
-#ifndef __GUI_FS_H
-#define __GUI_FS_H
+#ifndef GUI_FS_H
+#define GUI_FS_H
 
 #include <gtk/gtk.h>
 

Modified: trunk/gui/mplayer/gtk/mb.h
==============================================================================
--- trunk/gui/mplayer/gtk/mb.h	(original)
+++ trunk/gui/mplayer/gtk/mb.h	Tue Jul  3 00:34:45 2007
@@ -1,6 +1,6 @@
 
-#ifndef __GUI_MB_H
-#define __GUI_MB_H
+#ifndef GUI_MB_H
+#define GUI_MB_H
 
 #include <gtk/gtk.h>
 

Modified: trunk/gui/mplayer/gtk/menu.h
==============================================================================
--- trunk/gui/mplayer/gtk/menu.h	(original)
+++ trunk/gui/mplayer/gtk/menu.h	Tue Jul  3 00:34:45 2007
@@ -1,5 +1,5 @@
-#ifndef __GUI_MENU_H
-#define __GUI_MENU_H
+#ifndef GUI_MENU_H
+#define GUI_MENU_H
 
 #include <gtk/gtk.h>
 

Modified: trunk/gui/mplayer/gtk/opts.h
==============================================================================
--- trunk/gui/mplayer/gtk/opts.h	(original)
+++ trunk/gui/mplayer/gtk/opts.h	Tue Jul  3 00:34:45 2007
@@ -1,6 +1,6 @@
 
-#ifndef __GUI_OPTS_H
-#define __GUI_OPTS_H
+#ifndef GUI_OPTS_H
+#define GUI_OPTS_H
 
 #include <gtk/gtk.h>
 

Modified: trunk/gui/mplayer/gtk/pl.h
==============================================================================
--- trunk/gui/mplayer/gtk/pl.h	(original)
+++ trunk/gui/mplayer/gtk/pl.h	Tue Jul  3 00:34:45 2007
@@ -1,6 +1,6 @@
 
-#ifndef __GUI_PL_H
-#define __GUI_PL_H
+#ifndef GUI_PL_H
+#define GUI_PL_H
 
 #include <gtk/gtk.h>
 

Modified: trunk/gui/mplayer/gtk/sb.h
==============================================================================
--- trunk/gui/mplayer/gtk/sb.h	(original)
+++ trunk/gui/mplayer/gtk/sb.h	Tue Jul  3 00:34:45 2007
@@ -1,5 +1,5 @@
-#ifndef __GUI_SB_H
-#define __GUI_SB_H
+#ifndef GUI_SB_H
+#define GUI_SB_H
 
 #include <gtk/gtk.h>
 

Modified: trunk/gui/mplayer/gtk/url.h
==============================================================================
--- trunk/gui/mplayer/gtk/url.h	(original)
+++ trunk/gui/mplayer/gtk/url.h	Tue Jul  3 00:34:45 2007
@@ -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;

Modified: trunk/gui/mplayer/play.h
==============================================================================
--- trunk/gui/mplayer/play.h	(original)
+++ trunk/gui/mplayer/play.h	Tue Jul  3 00:34:45 2007
@@ -1,6 +1,6 @@
 
-#ifndef __GUI_PLAY_H
-#define __GUI_PLAY_H
+#ifndef GUI_PLAY_H
+#define GUI_PLAY_H
 
 #include "../config.h"
 

Modified: trunk/gui/mplayer/widgets.h
==============================================================================
--- trunk/gui/mplayer/widgets.h	(original)
+++ trunk/gui/mplayer/widgets.h	Tue Jul  3 00:34:45 2007
@@ -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>

Modified: trunk/gui/skin/cut.h
==============================================================================
--- trunk/gui/skin/cut.h	(original)
+++ trunk/gui/skin/cut.h	Tue Jul  3 00:34:45 2007
@@ -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 );

Modified: trunk/gui/skin/font.h
==============================================================================
--- trunk/gui/skin/font.h	(original)
+++ trunk/gui/skin/font.h	Tue Jul  3 00:34:45 2007
@@ -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"

Modified: trunk/gui/skin/skin.h
==============================================================================
--- trunk/gui/skin/skin.h	(original)
+++ trunk/gui/skin/skin.h	Tue Jul  3 00:34:45 2007
@@ -1,6 +1,6 @@
 
-#ifndef __GUI_SKIN_H
-#define __GUI_SKIN_H
+#ifndef GUI_SKIN_H
+#define GUI_SKIN_H
 
 #include "app.h"
 

Modified: trunk/gui/win32/dialogs.h
==============================================================================
--- trunk/gui/win32/dialogs.h	(original)
+++ trunk/gui/win32/dialogs.h	Tue Jul  3 00:34:45 2007
@@ -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)

Modified: trunk/gui/win32/gui.h
==============================================================================
--- trunk/gui/win32/gui.h	(original)
+++ trunk/gui/win32/gui.h	Tue Jul  3 00:34:45 2007
@@ -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"

Modified: trunk/gui/win32/playlist.h
==============================================================================
--- trunk/gui/win32/playlist.h	(original)
+++ trunk/gui/win32/playlist.h	Tue Jul  3 00:34:45 2007
@@ -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
 {

Modified: trunk/gui/win32/skinload.h
==============================================================================
--- trunk/gui/win32/skinload.h	(original)
+++ trunk/gui/win32/skinload.h	Tue Jul  3 00:34:45 2007
@@ -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
 {

Modified: trunk/gui/win32/wincfg.h
==============================================================================
--- trunk/gui/win32/wincfg.h	(original)
+++ trunk/gui/win32/wincfg.h	Tue Jul  3 00:34:45 2007
@@ -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;

Modified: trunk/gui/wm/ws.h
==============================================================================
--- trunk/gui/wm/ws.h	(original)
+++ trunk/gui/wm/ws.h	Tue Jul  3 00:34:45 2007
@@ -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>

Modified: trunk/gui/wm/wskeys.h
==============================================================================
--- trunk/gui/wm/wskeys.h	(original)
+++ trunk/gui/wm/wskeys.h	Tue Jul  3 00:34:45 2007
@@ -1,6 +1,6 @@
 
-#ifndef _GUI_WSKEYS_H
-#define _GUI_WSKEYS_H
+#ifndef GUI_WSKEYS_H
+#define GUI_WSKEYS_H
 
 #define wsKeyNone -1
 

Modified: trunk/gui/wm/wsxdnd.h
==============================================================================
--- trunk/gui/wm/wsxdnd.h	(original)
+++ trunk/gui/wm/wsxdnd.h	Tue Jul  3 00:34:45 2007
@@ -1,6 +1,6 @@
 
-#ifndef _GUI_WSXDND_H
-#define _GUI_WSXDND_H
+#ifndef GUI_WSXDND_H
+#define GUI_WSXDND_H
 
 
 void wsXDNDInitialize(void);

Modified: trunk/libaf/dsp.h
==============================================================================
--- trunk/libaf/dsp.h	(original)
+++ trunk/libaf/dsp.h	Tue Jul  3 00:34:45 2007
@@ -8,8 +8,8 @@
 //=============================================================================
 */
 
-#ifndef	_DSP_H
-#define	_DSP_H 	1
+#ifndef	DSP_H
+#define	DSP_H
 
 /* Implementation of routines used for DSP */
 

Modified: trunk/libaf/filter.h
==============================================================================
--- trunk/libaf/filter.h	(original)
+++ trunk/libaf/filter.h	Tue Jul  3 00:34:45 2007
@@ -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 

Modified: trunk/libaf/window.h
==============================================================================
--- trunk/libaf/window.h	(original)
+++ trunk/libaf/window.h	Tue Jul  3 00:34:45 2007
@@ -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);

Modified: trunk/libao2/audio_out.h
==============================================================================
--- trunk/libao2/audio_out.h	(original)
+++ trunk/libao2/audio_out.h	Tue Jul  3 00:34:45 2007
@@ -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
 {

Modified: trunk/libass/ass.h
==============================================================================
--- trunk/libass/ass.h	(original)
+++ trunk/libass/ass.h	Tue Jul  3 00:34:45 2007
@@ -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"
 

Modified: trunk/libass/ass_bitmap.h
==============================================================================
--- trunk/libass/ass_bitmap.h	(original)
+++ trunk/libass/ass_bitmap.h	Tue Jul  3 00:34:45 2007
@@ -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;
 

Modified: trunk/libass/ass_cache.h
==============================================================================
--- trunk/libass/ass_cache.h	(original)
+++ trunk/libass/ass_cache.h	Tue Jul  3 00:34:45 2007
@@ -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);

Modified: trunk/libass/ass_font.h
==============================================================================
--- trunk/libass/ass_font.h	(original)
+++ trunk/libass/ass_font.h	Tue Jul  3 00:34:45 2007
@@ -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>

Modified: trunk/libass/ass_fontconfig.h
==============================================================================
--- trunk/libass/ass_fontconfig.h	(original)
+++ trunk/libass/ass_fontconfig.h	Tue Jul  3 00:34:45 2007
@@ -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>

Modified: trunk/libass/ass_library.h
==============================================================================
--- trunk/libass/ass_library.h	(original)
+++ trunk/libass/ass_library.h	Tue Jul  3 00:34:45 2007
@@ -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;

Modified: trunk/libass/ass_mp.h
==============================================================================
--- trunk/libass/ass_mp.h	(original)
+++ trunk/libass/ass_mp.h	Tue Jul  3 00:34:45 2007
@@ -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"
 

Modified: trunk/libass/ass_types.h
==============================================================================
--- trunk/libass/ass_types.h	(original)
+++ trunk/libass/ass_types.h	Tue Jul  3 00:34:45 2007
@@ -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

Modified: trunk/libass/ass_utils.h
==============================================================================
--- trunk/libass/ass_utils.h	(original)
+++ trunk/libass/ass_utils.h	Tue Jul  3 00:34:45 2007
@@ -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);

Modified: trunk/libass/mputils.h
==============================================================================
--- trunk/libass/mputils.h	(original)
+++ trunk/libass/mputils.h	Tue Jul  3 00:34:45 2007
@@ -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"

Modified: trunk/libmpcodecs/ae.h
==============================================================================
--- trunk/libmpcodecs/ae.h	(original)
+++ trunk/libmpcodecs/ae.h	Tue Jul  3 00:34:45 2007
@@ -1,6 +1,6 @@
 
-#ifndef __MPAE_H__
-#define __MPAE_H__
+#ifndef MPAE_H
+#define MPAE_H
 
 #define ACODEC_COPY 0
 #define ACODEC_PCM 1

Modified: trunk/libmpcodecs/ae_lame.h
==============================================================================
--- trunk/libmpcodecs/ae_lame.h	(original)
+++ trunk/libmpcodecs/ae_lame.h	Tue Jul  3 00:34:45 2007
@@ -1,5 +1,5 @@
-#ifndef __AE_MP3LAME_H_
-#define __AE_MP3LAME_H_
+#ifndef AE_LAME_H
+#define AE_LAME_H
 
 #include "ae.h"
 

Modified: trunk/libmpcodecs/ae_lavc.h
==============================================================================
--- trunk/libmpcodecs/ae_lavc.h	(original)
+++ trunk/libmpcodecs/ae_lavc.h	Tue Jul  3 00:34:45 2007
@@ -1,5 +1,5 @@
-#ifndef __AE_LAVC_H_
-#define __AE_LAVC_H_
+#ifndef AE_LAVC_H
+#define AE_LAVC_H
 
 #include "ae.h"
 

Modified: trunk/libmpcodecs/ae_pcm.h
==============================================================================
--- trunk/libmpcodecs/ae_pcm.h	(original)
+++ trunk/libmpcodecs/ae_pcm.h	Tue Jul  3 00:34:45 2007
@@ -1,5 +1,5 @@
-#ifndef __AE_PCM_H_
-#define __AE_PCM_H_
+#ifndef AE_PCM_H
+#define AE_PCM_H
 
 #include "ae.h"
 

Modified: trunk/libmpcodecs/cmmx.h
==============================================================================
--- trunk/libmpcodecs/cmmx.h	(original)
+++ trunk/libmpcodecs/cmmx.h	Tue Jul  3 00:34:45 2007
@@ -4,8 +4,8 @@
  * Author: Zoltan Hidvegi
  */
 
-#ifndef __CMMX_H
-#define __CMMX_H
+#ifndef CMMX_H
+#define CMMX_H
 
 typedef unsigned long cmmx_t;
 

Modified: trunk/libmpcodecs/img_format.h
==============================================================================
--- trunk/libmpcodecs/img_format.h	(original)
+++ trunk/libmpcodecs/img_format.h	Tue Jul  3 00:34:45 2007
@@ -1,6 +1,6 @@
 
-#ifndef __IMG_FORMAT_H
-#define __IMG_FORMAT_H
+#ifndef IMG_FORMAT_H
+#define IMG_FORMAT_H
 
 /* RGB/BGR Formats */
 

Modified: trunk/libmpcodecs/mp_image.h
==============================================================================
--- trunk/libmpcodecs/mp_image.h	(original)
+++ trunk/libmpcodecs/mp_image.h	Tue Jul  3 00:34:45 2007
@@ -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) ---------
 

Modified: trunk/libmpdemux/asf.h
==============================================================================
--- trunk/libmpdemux/asf.h	(original)
+++ trunk/libmpdemux/asf.h	Tue Jul  3 00:34:45 2007
@@ -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>

Modified: trunk/libmpdemux/aviheader.h
==============================================================================
--- trunk/libmpdemux/aviheader.h	(original)
+++ trunk/libmpdemux/aviheader.h	Tue Jul  3 00:34:45 2007
@@ -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"

Modified: trunk/libmpdemux/demux_rtp.h
==============================================================================
--- trunk/libmpdemux/demux_rtp.h	(original)
+++ trunk/libmpdemux/demux_rtp.h	Tue Jul  3 00:34:45 2007
@@ -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
 

Modified: trunk/libmpdemux/demux_rtp_internal.h
==============================================================================
--- trunk/libmpdemux/demux_rtp_internal.h	(original)
+++ trunk/libmpdemux/demux_rtp_internal.h	Tue Jul  3 00:34:45 2007
@@ -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

Modified: trunk/libmpdemux/demuxer.h
==============================================================================
--- trunk/libmpdemux/demuxer.h	(original)
+++ trunk/libmpdemux/demuxer.h	Tue Jul  3 00:34:45 2007
@@ -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* demux
 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 */

Modified: trunk/libmpdemux/ebml.h
==============================================================================
--- trunk/libmpdemux/ebml.h	(original)
+++ trunk/libmpdemux/ebml.h	Tue Jul  3 00:34:45 2007
@@ -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_
 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 */

Modified: trunk/libmpdemux/genres.h
==============================================================================
--- trunk/libmpdemux/genres.h	(original)
+++ trunk/libmpdemux/genres.h	Tue Jul  3 00:34:45 2007
@@ -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 */

Modified: trunk/libmpdemux/matroska.h
==============================================================================
--- trunk/libmpdemux/matroska.h	(original)
+++ trunk/libmpdemux/matroska.h	Tue Jul  3 00:34:45 2007
@@ -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 
 void demux_mkv_get_sub_lang(demuxer_t *demuxer, int track_num, char *lang,
                             int maxlen);
 
-#endif /* __MATROSKA_H */
+#endif /* MATROSKA_H */

Modified: trunk/libmpdemux/mf.h
==============================================================================
--- trunk/libmpdemux/mf.h	(original)
+++ trunk/libmpdemux/mf.h	Tue Jul  3 00:34:45 2007
@@ -1,6 +1,6 @@
 
-#ifndef _MF_H
-#define _MF_H
+#ifndef MF_H
+#define MF_H
 
 extern int    mf_w;
 extern int    mf_h;

Modified: trunk/libmpdemux/mpeg_packetizer.h
==============================================================================
--- trunk/libmpdemux/mpeg_packetizer.h	(original)
+++ trunk/libmpdemux/mpeg_packetizer.h	Tue Jul  3 00:34:45 2007
@@ -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
                            int id, uint64_t pts, int freq_id,
                            int my_write (unsigned char *data, int len));
 
-#endif /* _MPEG_PACKETIZER_H_ */
+#endif /* MPEG_PACKETIZER_H */

Modified: trunk/libmpdemux/ms_hdr.h
==============================================================================
--- trunk/libmpdemux/ms_hdr.h	(original)
+++ trunk/libmpdemux/ms_hdr.h	Tue Jul  3 00:34:45 2007
@@ -1,5 +1,5 @@
-#ifndef __MS_HDR_H
-#define __MS_HDR_H
+#ifndef MS_HDR_H
+#define MS_HDR_H
 
 #ifndef _WAVEFORMATEX_
 #define _WAVEFORMATEX_

Modified: trunk/libmpdemux/parse_mp4.h
==============================================================================
--- trunk/libmpdemux/parse_mp4.h	(original)
+++ trunk/libmpdemux/parse_mp4.h	Tue Jul  3 00:34:45 2007
@@ -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 */
 

Modified: trunk/libmpdemux/stheader.h
==============================================================================
--- trunk/libmpdemux/stheader.h	(original)
+++ trunk/libmpdemux/stheader.h	Tue Jul  3 00:34:45 2007
@@ -1,5 +1,5 @@
-#ifndef __STHEADER_H__
-#define __STHEADER_H__
+#ifndef STHEADER_H
+#define STHEADER_H
 
 #include "aviheader.h"
 #include "ms_hdr.h"

Modified: trunk/libmpdemux/yuv4mpeg.h
==============================================================================
--- trunk/libmpdemux/yuv4mpeg.h	(original)
+++ trunk/libmpdemux/yuv4mpeg.h	Tue Jul  3 00:34:45 2007
@@ -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 */
 
 

Modified: trunk/libmpdemux/yuv4mpeg_intern.h
==============================================================================
--- trunk/libmpdemux/yuv4mpeg_intern.h	(original)
+++ trunk/libmpdemux/yuv4mpeg_intern.h	Tue Jul  3 00:34:45 2007
@@ -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 */

Modified: trunk/libvo/aspect.h
==============================================================================
--- trunk/libvo/aspect.h	(original)
+++ trunk/libvo/aspect.h	Tue Jul  3 00:34:45 2007
@@ -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;

Modified: trunk/libvo/fastmemcpy.h
==============================================================================
--- trunk/libvo/fastmemcpy.h	(original)
+++ trunk/libvo/fastmemcpy.h	Tue Jul  3 00:34:45 2007
@@ -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>

Modified: trunk/libvo/font_load.h
==============================================================================
--- trunk/libvo/font_load.h	(original)
+++ trunk/libvo/font_load.h	Tue Jul  3 00:34:45 2007
@@ -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, 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 /* ! MPLAYER_FONT_LOAD_H */

Modified: trunk/libvo/geometry.h
==============================================================================
--- trunk/libvo/geometry.h	(original)
+++ trunk/libvo/geometry.h	Tue Jul  3 00:34:45 2007
@@ -1,9 +1,9 @@
 /* This file (C) Mark Zealey <mark at 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 */

Modified: trunk/libvo/gl_common.h
==============================================================================
--- trunk/libvo/gl_common.h	(original)
+++ trunk/libvo/gl_common.h	Tue Jul  3 00:34:45 2007
@@ -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"

Modified: trunk/libvo/gtf.h
==============================================================================
--- trunk/libvo/gtf.h	(original)
+++ trunk/libvo/gtf.h	Tue Jul  3 00:34:45 2007
@@ -1,5 +1,5 @@
-#ifndef __GTF_H
-#define __GTF_H
+#ifndef GTF_H
+#define GTF_H
 
 #include <vbe.h>
 

Modified: trunk/libvo/osd.h
==============================================================================
--- trunk/libvo/osd.h	(original)
+++ trunk/libvo/osd.h	Tue Jul  3 00:34:45 2007
@@ -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)

Modified: trunk/libvo/sub.h
==============================================================================
--- trunk/libvo/sub.h	(original)
+++ trunk/libvo/sub.h	Tue Jul  3 00:34:45 2007
@@ -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;

Modified: trunk/libvo/vesa_lvo.h
==============================================================================
--- trunk/libvo/vesa_lvo.h	(original)
+++ trunk/libvo/vesa_lvo.h	Tue Jul  3 00:34:45 2007
@@ -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,

Modified: trunk/libvo/video_out.h
==============================================================================
--- trunk/libvo/video_out.h	(original)
+++ trunk/libvo/video_out.h	Tue Jul  3 00:34:45 2007
@@ -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>

Modified: trunk/libvo/vosub_vidix.h
==============================================================================
--- trunk/libvo/vosub_vidix.h	(original)
+++ trunk/libvo/vosub_vidix.h	Tue Jul  3 00:34:45 2007
@@ -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);

Modified: trunk/libvo/wskeys.h
==============================================================================
--- trunk/libvo/wskeys.h	(original)
+++ trunk/libvo/wskeys.h	Tue Jul  3 00:34:45 2007
@@ -1,6 +1,6 @@
 
-#ifndef _WSKEYS_H
-#define _WSKEYS_H
+#ifndef WSKEYS_H
+#define WSKEYS_H
 
 #define wsosbrackets '['
 #define wscsbrackets ']'

Modified: trunk/m_config.h
==============================================================================
--- trunk/m_config.h	(original)
+++ trunk/m_config.h	Tue Jul  3 00:34:45 2007
@@ -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* 
 
 ///@}
 
-#endif /* _M_CONFIG_H */
+#endif /* M_CONFIG_H */

Modified: trunk/m_option.h
==============================================================================
--- trunk/m_option.h	(original)
+++ trunk/m_option.h	Tue Jul  3 00:34:45 2007
@@ -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 */

Modified: trunk/m_struct.h
==============================================================================
--- trunk/m_struct.h	(original)
+++ trunk/m_struct.h	Tue Jul  3 00:34:45 2007
@@ -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 
 
 ///@}
 
-#endif /* _M_STRUCT_H */
+#endif /* M_STRUCT_H */

Modified: trunk/mangle.h
==============================================================================
--- trunk/mangle.h	(original)
+++ trunk/mangle.h	Tue Jul  3 00:34:45 2007
@@ -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 */
 

Modified: trunk/metadata.h
==============================================================================
--- trunk/metadata.h	(original)
+++ trunk/metadata.h	Tue Jul  3 00:34:45 2007
@@ -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 */
 

Modified: trunk/mp_msg.h
==============================================================================
--- trunk/mp_msg.h	(original)
+++ trunk/mp_msg.h	Tue Jul  3 00:34:45 2007
@@ -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;

Modified: trunk/playtree.h
==============================================================================
--- trunk/playtree.h	(original)
+++ trunk/playtree.h	Tue Jul  3 00:34:45 2007
@@ -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;

Modified: trunk/playtreeparser.h
==============================================================================
--- trunk/playtreeparser.h	(original)
+++ trunk/playtreeparser.h	Tue Jul  3 00:34:45 2007
@@ -8,8 +8,8 @@
 
 /// \file
 
-#ifndef __PLAYTREEPARSER_H
-#define __PLAYTREEPARSER_H
+#ifndef PLAYTREEPARSER_H
+#define PLAYTREEPARSER_H
 
 struct stream_st;
 

Modified: trunk/spudec.h
==============================================================================
--- trunk/spudec.h	(original)
+++ trunk/spudec.h	Tue Jul  3 00:34:45 2007
@@ -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"
 

Modified: trunk/stream/audio_in.h
==============================================================================
--- trunk/stream/audio_in.h	(original)
+++ trunk/stream/audio_in.h	Tue Jul  3 00:34:45 2007
@@ -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 */

Modified: trunk/stream/cache2.h
==============================================================================
--- trunk/stream/cache2.h	(original)
+++ trunk/stream/cache2.h	Tue Jul  3 00:34:45 2007
@@ -1,5 +1,5 @@
-#ifndef _cache2_h
-#define _cache2_h
+#ifndef CACHE2_H
+#define CACHE2_H
 
 extern void cache_uninit(stream_t *s);
 

Modified: trunk/stream/cdd.h
==============================================================================
--- trunk/stream/cdd.h	(original)
+++ trunk/stream/cdd.h	Tue Jul  3 00:34:45 2007
@@ -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 
 
 void 		cd_info_debug(cd_info_t *cd_info);
 
-#endif // __CDD_H__
+#endif /* CDD_H */

Modified: trunk/stream/cookies.h
==============================================================================
--- trunk/stream/cookies.h	(original)
+++ trunk/stream/cookies.h	Tue Jul  3 00:34:45 2007
@@ -5,8 +5,8 @@
  * by Dave Lambley <mplayer at davel.me.uk>
  */
 
-#ifndef __COOKIES_H
-#define __COOKIES_H
+#ifndef COOKIES_H
+#define COOKIES_H
 
 #include "http.h"
 

Modified: trunk/stream/http.h
==============================================================================
--- trunk/stream/http.h	(original)
+++ trunk/stream/http.h	Tue Jul  3 00:34:45 2007
@@ -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
 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 */

Modified: trunk/stream/librtsp/rtsp_rtp.h
==============================================================================
--- trunk/stream/librtsp/rtsp_rtp.h	(original)
+++ trunk/stream/librtsp/rtsp_rtp.h	Tue Jul  3 00:34:45 2007
@@ -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_
 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 */
 

Modified: trunk/stream/network.h
==============================================================================
--- trunk/stream/network.h	(original)
+++ trunk/stream/network.h	Tue Jul  3 00:34:45 2007
@@ -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>

Modified: trunk/stream/realrtsp/xbuffer.h
==============================================================================
--- trunk/stream/realrtsp/xbuffer.h	(original)
+++ trunk/stream/realrtsp/xbuffer.h	Tue Jul  3 00:34:45 2007
@@ -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);

Modified: trunk/stream/rtp.h
==============================================================================
--- trunk/stream/rtp.h	(original)
+++ trunk/stream/rtp.h	Tue Jul  3 00:34:45 2007
@@ -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);
 

Modified: trunk/stream/stream.h
==============================================================================
--- trunk/stream/stream.h	(original)
+++ trunk/stream/stream.h	Tue Jul  3 00:34:45 2007
@@ -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

Modified: trunk/stream/stream_dvdnav.h
==============================================================================
--- trunk/stream/stream_dvdnav.h	(original)
+++ trunk/stream/stream_dvdnav.h	Tue Jul  3 00:34:45 2007
@@ -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>
 

Modified: trunk/stream/stream_radio.h
==============================================================================
--- trunk/stream/stream_radio.h	(original)
+++ trunk/stream/stream_radio.h	Tue Jul  3 00:34:45 2007
@@ -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

Modified: trunk/stream/tcp.h
==============================================================================
--- trunk/stream/tcp.h	(original)
+++ trunk/stream/tcp.h	Tue Jul  3 00:34:45 2007
@@ -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
 #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 */

Modified: trunk/stream/udp.h
==============================================================================
--- trunk/stream/udp.h	(original)
+++ trunk/stream/udp.h	Tue Jul  3 00:34:45 2007
@@ -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 */

Modified: trunk/stream/url.h
==============================================================================
--- trunk/stream/url.h	(original)
+++ trunk/stream/url.h	Tue Jul  3 00:34:45 2007
@@ -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 */

Modified: trunk/subreader.h
==============================================================================
--- trunk/subreader.h	(original)
+++ trunk/subreader.h	Tue Jul  3 00:34:45 2007
@@ -1,5 +1,5 @@
-#ifndef __MPLAYER_SUBREADER_H
-#define __MPLAYER_SUBREADER_H
+#ifndef MPLAYER_SUBREADER_H
+#define MPLAYER_SUBREADER_H
 
 #include <stdio.h>
 

Modified: trunk/xvid_vbr.h
==============================================================================
--- trunk/xvid_vbr.h	(original)
+++ trunk/xvid_vbr.h	Tue Jul  3 00:34:45 2007
@@ -23,8 +23,8 @@
  *
  *****************************************************************************/
 
-#ifndef __XVID_VBR_H__
-#define __XVID_VBR_H__
+#ifndef XVID_VBR_H
+#define XVID_VBR_H
 
 #define VBR_VERSION 0
 

