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
hanyong · Jul 2, 2007 · 3e9e4ac · 3e9e4ac
1 parent 80afc93
commit 3e9e4ac
Show file tree

Hide file tree

Showing 103 changed files with 241 additions and 239 deletions.
diff --git a/gui/app.h b/gui/app.h
@@ -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
@@ -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 */
diff --git a/gui/cfg.h b/gui/cfg.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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;