From 3e9e4acd8dd7b602519a0f5659e6e108efdf31fe Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 2 Jul 2007 22:34:45 +0000 Subject: Do not use leading underscores in multiple inclusion guards, they are reserved. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23709 b3059339-0415-0410-9bf9-f77b7e298cf2 --- gui/app.h | 4 ++-- gui/bitmap.h | 6 +++--- gui/cfg.h | 4 ++-- gui/interface.h | 4 ++-- gui/mplayer/common.h | 5 +++-- gui/mplayer/gmplayer.h | 4 ++-- gui/mplayer/gtk/about.h | 4 ++-- gui/mplayer/gtk/common.h | 4 ++-- gui/mplayer/gtk/eq.h | 4 ++-- gui/mplayer/gtk/fs.h | 4 ++-- gui/mplayer/gtk/mb.h | 4 ++-- gui/mplayer/gtk/menu.h | 4 ++-- gui/mplayer/gtk/opts.h | 4 ++-- gui/mplayer/gtk/pl.h | 4 ++-- gui/mplayer/gtk/sb.h | 4 ++-- gui/mplayer/gtk/url.h | 4 ++-- gui/mplayer/play.h | 4 ++-- gui/mplayer/widgets.h | 4 ++-- gui/skin/cut.h | 4 ++-- gui/skin/font.h | 4 ++-- gui/skin/skin.h | 4 ++-- gui/win32/dialogs.h | 4 ++-- gui/win32/gui.h | 5 +++-- gui/win32/playlist.h | 4 ++-- gui/win32/skinload.h | 4 ++-- gui/win32/wincfg.h | 4 ++-- gui/wm/ws.h | 4 ++-- gui/wm/wskeys.h | 4 ++-- gui/wm/wsxdnd.h | 4 ++-- 29 files changed, 61 insertions(+), 59 deletions(-) (limited to 'gui') diff --git a/gui/app.h b/gui/app.h index 523bfad01f..197c294bcc 100644 --- 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 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 */ diff --git a/gui/cfg.h b/gui/cfg.h index b0ce17cd2d..c2e84efb6d 100644 --- 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 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 #include 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 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 #include 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 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 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 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 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 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 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 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 #include 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 #include 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); -- cgit v1.2.3