summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-02-22 09:09:46 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-02-22 09:09:46 +0000
commit8efb2fa21c81f99b37795621f9ec2bc125c6ced0 (patch)
tree9a6f354228affe704b16844775070159e82b5fcd /gui
parent50899e9083661200d9bb105dca0339c14e56d271 (diff)
downloadmpv-8efb2fa21c81f99b37795621f9ec2bc125c6ced0.tar.bz2
mpv-8efb2fa21c81f99b37795621f9ec2bc125c6ced0.tar.xz
Add MPLAYER_ prefix to multiple inclusion guards.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'gui')
-rw-r--r--gui/app.h7
-rw-r--r--gui/bitmap.h6
-rw-r--r--gui/cfg.h7
-rw-r--r--gui/interface.h7
-rw-r--r--gui/mplayer/gmplayer.h7
-rw-r--r--gui/mplayer/gtk/about.h7
-rw-r--r--gui/mplayer/gtk/eq.h7
-rw-r--r--gui/mplayer/gtk/fs.h6
-rw-r--r--gui/mplayer/gtk/gtk_common.h7
-rw-r--r--gui/mplayer/gtk/mb.h7
-rw-r--r--gui/mplayer/gtk/menu.h6
-rw-r--r--gui/mplayer/gtk/opts.h7
-rw-r--r--gui/mplayer/gtk/pl.h7
-rw-r--r--gui/mplayer/gtk/sb.h6
-rw-r--r--gui/mplayer/gtk/url.h7
-rw-r--r--gui/mplayer/gui_common.h7
-rw-r--r--gui/mplayer/play.h7
-rw-r--r--gui/mplayer/widgets.h7
-rw-r--r--gui/skin/cut.h7
-rw-r--r--gui/skin/font.h7
-rw-r--r--gui/skin/skin.h7
-rw-r--r--gui/win32/dialogs.h6
-rw-r--r--gui/win32/gui.h6
-rw-r--r--gui/win32/playlist.h6
-rw-r--r--gui/win32/skinload.h6
-rw-r--r--gui/win32/wincfg.h6
-rw-r--r--gui/wm/ws.h6
-rw-r--r--gui/wm/wskeys.h7
-rw-r--r--gui/wm/wsmkeys.h6
-rw-r--r--gui/wm/wsxdnd.h7
30 files changed, 90 insertions, 109 deletions
diff --git a/gui/app.h b/gui/app.h
index 1d00f20636..5e5874c5b4 100644
--- a/gui/app.h
+++ b/gui/app.h
@@ -1,6 +1,5 @@
-
-#ifndef GUI_APP_H
-#define GUI_APP_H
+#ifndef MPLAYER_GUI_APP_H
+#define MPLAYER_GUI_APP_H
#include "bitmap.h"
#include "wm/ws.h"
@@ -184,4 +183,4 @@ extern void btnModify( int event,float state );
extern float btnGetValue( int event );
extern void btnSet( int event,int set );
-#endif /* GUI_APP_H */
+#endif /* MPLAYER_GUI_APP_H */
diff --git a/gui/bitmap.h b/gui/bitmap.h
index 06194514e0..af3ef8c7b0 100644
--- a/gui/bitmap.h
+++ b/gui/bitmap.h
@@ -1,5 +1,5 @@
-#ifndef GUI_BITMAP_H
-#define GUI_BITMAP_H
+#ifndef MPLAYER_GUI_BITMAP_H
+#define MPLAYER_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 /* MPLAYER_GUI_BITMAP_H */
diff --git a/gui/cfg.h b/gui/cfg.h
index aba1b9f298..97f0cb3f82 100644
--- a/gui/cfg.h
+++ b/gui/cfg.h
@@ -1,6 +1,5 @@
-
-#ifndef GUI_CFG_H
-#define GUI_CFG_H
+#ifndef MPLAYER_GUI_CFG_H
+#define MPLAYER_GUI_CFG_H
extern int gtkEnableAudioEqualizer;
@@ -59,4 +58,4 @@ extern gtkASS_t gtkASS;
extern int cfg_read( void );
extern int cfg_write( void );
-#endif /* GUI_CFG_H */
+#endif /* MPLAYER_GUI_CFG_H */
diff --git a/gui/interface.h b/gui/interface.h
index 1217d1e479..f3b4781ad2 100644
--- a/gui/interface.h
+++ b/gui/interface.h
@@ -1,6 +1,5 @@
-
-#ifndef GUI_INTERFACE_H
-#define GUI_INTERFACE_H
+#ifndef MPLAYER_GUI_INTERFACE_H
+#define MPLAYER_GUI_INTERFACE_H
#include "../config.h"
#include "mplayer/play.h"
@@ -223,4 +222,4 @@ extern char * gstrchr( char * str,int c );
sprintf( s,"%s/%s",d,n ); \
}
-#endif /* GUI_INTERFACE_H */
+#endif /* MPLAYER_GUI_INTERFACE_H */
diff --git a/gui/mplayer/gmplayer.h b/gui/mplayer/gmplayer.h
index e0d9c9b6a0..35bed406a7 100644
--- a/gui/mplayer/gmplayer.h
+++ b/gui/mplayer/gmplayer.h
@@ -1,6 +1,5 @@
-
-#ifndef GUI_GMPLAYER_H
-#define GUI_GMPLAYER_H
+#ifndef MPLAYER_GUI_GMPLAYER_H
+#define MPLAYER_GUI_GMPLAYER_H
extern int mplSubRender;
extern int mplMainRender;
@@ -31,4 +30,4 @@ extern void mplMenuMouseHandle( int X,int Y,int RX,int RY );
extern void mplPBInit( void );
extern void mplPBShow( int x, int y );
-#endif /* GUI_GMPLAYER_H */
+#endif /* MPLAYER_GUI_GMPLAYER_H */
diff --git a/gui/mplayer/gtk/about.h b/gui/mplayer/gtk/about.h
index 9b8337c53e..155f71566e 100644
--- a/gui/mplayer/gtk/about.h
+++ b/gui/mplayer/gtk/about.h
@@ -1,6 +1,5 @@
-
-#ifndef GUI_ABOUT_H
-#define GUI_ABOUT_H
+#ifndef MPLAYER_GUI_ABOUT_H
+#define MPLAYER_GUI_ABOUT_H
#include <gtk/gtk.h>
@@ -9,4 +8,4 @@ extern GtkWidget * About;
extern GtkWidget * create_About( void );
extern void ShowAboutBox( void );
-#endif /* GUI_ABOUT_H */
+#endif /* MPLAYER_GUI_ABOUT_H */
diff --git a/gui/mplayer/gtk/eq.h b/gui/mplayer/gtk/eq.h
index 093bce8092..d99cbb7785 100644
--- a/gui/mplayer/gtk/eq.h
+++ b/gui/mplayer/gtk/eq.h
@@ -1,6 +1,5 @@
-
-#ifndef GUI_EQ_H
-#define GUI_EQ_H
+#ifndef MPLAYER_GUI_EQ_H
+#define MPLAYER_GUI_EQ_H
#include <gtk/gtk.h>
@@ -9,4 +8,4 @@ extern GtkWidget * Equalizer;
extern GtkWidget * create_Equalizer( void );
extern void ShowEqualizer( void );
-#endif /* GUI_EQ_H */
+#endif /* MPLAYER_GUI_EQ_H */
diff --git a/gui/mplayer/gtk/fs.h b/gui/mplayer/gtk/fs.h
index 31e9a54d5d..5e38da023f 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 MPLAYER_GUI_FS_H
+#define MPLAYER_GUI_FS_H
#include <gtk/gtk.h>
@@ -18,4 +18,4 @@ extern void ShowFileSelect( int type, int modal );
extern GtkWidget * create_FileSelect( void );
-#endif /* GUI_FS_H */
+#endif /* MPLAYER_GUI_FS_H */
diff --git a/gui/mplayer/gtk/gtk_common.h b/gui/mplayer/gtk/gtk_common.h
index e358a7c30d..fb3619f9a8 100644
--- a/gui/mplayer/gtk/gtk_common.h
+++ b/gui/mplayer/gtk/gtk_common.h
@@ -1,6 +1,5 @@
-
-#ifndef GUI_GTK_COMMON_H
-#define GUI_GTK_COMMON_H
+#ifndef MPLAYER_GUI_GTK_COMMON_H
+#define MPLAYER_GUI_GTK_COMMON_H
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
@@ -21,4 +20,4 @@ extern GtkWidget * AddVScaler( GtkAdjustment * adj,GtkWidget * parent,int digit
extern GtkWidget * AddComboBox( GtkWidget * parent );
extern void WidgetDestroy( GtkWidget * widget,GtkWidget ** widget_pointer );
-#endif /* GUI_GTK_COMMON_H */
+#endif /* MPLAYER_GUI_GTK_COMMON_H */
diff --git a/gui/mplayer/gtk/mb.h b/gui/mplayer/gtk/mb.h
index f77dfb35ae..adb90f1dbc 100644
--- a/gui/mplayer/gtk/mb.h
+++ b/gui/mplayer/gtk/mb.h
@@ -1,6 +1,5 @@
-
-#ifndef GUI_MB_H
-#define GUI_MB_H
+#ifndef MPLAYER_GUI_MB_H
+#define MPLAYER_GUI_MB_H
#include <gtk/gtk.h>
@@ -9,4 +8,4 @@ extern GtkWidget * MessageBox;
extern GtkWidget * create_MessageBox( int type );
extern void ShowMessageBox( const char * msg );
-#endif /* GUI_MB_H */
+#endif /* MPLAYER_GUI_MB_H */
diff --git a/gui/mplayer/gtk/menu.h b/gui/mplayer/gtk/menu.h
index 8e272ba0df..f82eeff01f 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 MPLAYER_GUI_MENU_H
+#define MPLAYER_GUI_MENU_H
#include <gtk/gtk.h>
@@ -10,4 +10,4 @@ extern GtkWidget * AddSubMenu( GtkWidget *window1, const char * immagine_xpm, Gt
extern GtkWidget * AddSeparator( GtkWidget * Menu );
extern GtkWidget * create_PopUpMenu( void );
-#endif /* GUI_MENU_H */
+#endif /* MPLAYER_GUI_MENU_H */
diff --git a/gui/mplayer/gtk/opts.h b/gui/mplayer/gtk/opts.h
index 93ace3af3f..9cff8a3d62 100644
--- a/gui/mplayer/gtk/opts.h
+++ b/gui/mplayer/gtk/opts.h
@@ -1,6 +1,5 @@
-
-#ifndef GUI_OPTS_H
-#define GUI_OPTS_H
+#ifndef MPLAYER_GUI_OPTS_H
+#define MPLAYER_GUI_OPTS_H
#include <gtk/gtk.h>
@@ -13,4 +12,4 @@ extern GtkWidget * create_AudioConfig( void );
extern void ShowPreferences( void );
-#endif /* GUI_OPTS_H */
+#endif /* MPLAYER_GUI_OPTS_H */
diff --git a/gui/mplayer/gtk/pl.h b/gui/mplayer/gtk/pl.h
index 5d6780c0b8..9c82b730f9 100644
--- a/gui/mplayer/gtk/pl.h
+++ b/gui/mplayer/gtk/pl.h
@@ -1,6 +1,5 @@
-
-#ifndef GUI_PL_H
-#define GUI_PL_H
+#ifndef MPLAYER_GUI_PL_H
+#define MPLAYER_GUI_PL_H
#include <gtk/gtk.h>
@@ -9,4 +8,4 @@ extern void HidePlayList( void );
extern GtkWidget * create_PlayList (void);
-#endif /* GUI_PL_H */
+#endif /* MPLAYER_GUI_PL_H */
diff --git a/gui/mplayer/gtk/sb.h b/gui/mplayer/gtk/sb.h
index a1a7e3775d..d26b75c4d5 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 MPLAYER_GUI_SB_H
+#define MPLAYER_GUI_SB_H
#include <gtk/gtk.h>
@@ -9,4 +9,4 @@ extern GtkWidget * SkinBrowser;
extern void ShowSkinBrowser( void );
extern GtkWidget * create_SkinBrowser( void );
-#endif /* GUI_SB_H */
+#endif /* MPLAYER_GUI_SB_H */
diff --git a/gui/mplayer/gtk/url.h b/gui/mplayer/gtk/url.h
index 93d37a20db..1fca6a1fb9 100644
--- a/gui/mplayer/gtk/url.h
+++ b/gui/mplayer/gtk/url.h
@@ -1,6 +1,5 @@
-
-#ifndef GUI_URL_H
-#define GUI_URL_H
+#ifndef MPLAYER_GUI_URL_H
+#define MPLAYER_GUI_URL_H
extern GtkWidget * URL;
extern int gtkVURLDialogBox;
@@ -8,4 +7,4 @@ extern int gtkVURLDialogBox;
extern void ShowURLDialogBox( void );
extern GtkWidget * create_URL( void );
-#endif /* GUI_URL_H */
+#endif /* MPLAYER_GUI_URL_H */
diff --git a/gui/mplayer/gui_common.h b/gui/mplayer/gui_common.h
index 2aec358480..441b3455dc 100644
--- a/gui/mplayer/gui_common.h
+++ b/gui/mplayer/gui_common.h
@@ -1,6 +1,5 @@
-
-#ifndef GUI_GUI_COMMON_H
-#define GUI_GUI_COMMON_H
+#ifndef MPLAYER_GUI_GUI_COMMON_H
+#define MPLAYER_GUI_GUI_COMMON_H
#include <stdlib.h>
#include <stdio.h>
@@ -18,4 +17,4 @@ extern void PutImage( txSample * bf,int x,int y,int max,int ofs );
extern void SimplePotmeterPutImage( txSample * bf,int x,int y,float frac );
extern void Render( wsTWindow * window,wItem * Items,int nrItems,char * db,int size );
-#endif /* GUI_GUI_COMMON_H */
+#endif /* MPLAYER_GUI_GUI_COMMON_H */
diff --git a/gui/mplayer/play.h b/gui/mplayer/play.h
index 2e545bc3e3..13cdc72e56 100644
--- a/gui/mplayer/play.h
+++ b/gui/mplayer/play.h
@@ -1,6 +1,5 @@
-
-#ifndef GUI_PLAY_H
-#define GUI_PLAY_H
+#ifndef MPLAYER_GUI_PLAY_H
+#define MPLAYER_GUI_PLAY_H
#include "../config.h"
@@ -31,4 +30,4 @@ extern void EventHandling( void );
extern void mplSetFileName( char * dir,char * name,int type );
-#endif /* GUI_PLAY_H */
+#endif /* MPLAYER_GUI_PLAY_H */
diff --git a/gui/mplayer/widgets.h b/gui/mplayer/widgets.h
index 255737c74f..b6135f35ac 100644
--- a/gui/mplayer/widgets.h
+++ b/gui/mplayer/widgets.h
@@ -1,6 +1,5 @@
-
-#ifndef GUI_WIDGETS_H
-#define GUI_WIDGETS_H
+#ifndef MPLAYER_GUI_WIDGETS_H
+#define MPLAYER_GUI_WIDGETS_H
#include <stdio.h>
#include <stdlib.h>
@@ -60,4 +59,4 @@ extern void gtkMessageBox( int type,const gchar * str );
extern void gtkSetLayer( GtkWidget * wdg );
extern void gtkActive( GtkWidget * wdg );
-#endif /* GUI_WIDGETS_H */
+#endif /* MPLAYER_GUI_WIDGETS_H */
diff --git a/gui/skin/cut.h b/gui/skin/cut.h
index 66ac10abef..04352e979e 100644
--- a/gui/skin/cut.h
+++ b/gui/skin/cut.h
@@ -1,10 +1,9 @@
-
-#ifndef GUI_CUT_H
-#define GUI_CUT_H
+#ifndef MPLAYER_GUI_CUT_H
+#define MPLAYER_GUI_CUT_H
extern void cutItem( char * in,char * out,char sep,int num );
extern int cutItemToInt( char * in,char sep,int num );
extern float cutItemToFloat( char * in,char sep,int num );
extern void cutChunk( char * in,char * s1 );
-#endif /* GUI_CUT_H */
+#endif /* MPLAYER_GUI_CUT_H */
diff --git a/gui/skin/font.h b/gui/skin/font.h
index 1392febb5a..caeac4c597 100644
--- a/gui/skin/font.h
+++ b/gui/skin/font.h
@@ -1,6 +1,5 @@
-
-#ifndef GUI_FONT_H
-#define GUI_FONT_H
+#ifndef MPLAYER_GUI_FONT_H
+#define MPLAYER_GUI_FONT_H
#include "bitmap.h"
#include "app.h"
@@ -34,4 +33,4 @@ extern int fntTextWidth( int id,char * str );
extern int fntRead( char * path,char * fname );
extern txSample * fntRender( wItem * item,int px,const char * fmt,... );
-#endif /* GUI_FONT_H */
+#endif /* MPLAYER_GUI_FONT_H */
diff --git a/gui/skin/skin.h b/gui/skin/skin.h
index a1540ecd07..0411b27e13 100644
--- a/gui/skin/skin.h
+++ b/gui/skin/skin.h
@@ -1,6 +1,5 @@
-
-#ifndef GUI_SKIN_H
-#define GUI_SKIN_H
+#ifndef MPLAYER_GUI_SKIN_H
+#define MPLAYER_GUI_SKIN_H
#include "app.h"
@@ -15,4 +14,4 @@ extern char * trimleft( char * in );
extern char * strswap( char * in,char what,char whereof );
extern char * trim( char * in );
-#endif /* GUI_SKIN_H */
+#endif /* MPLAYER_GUI_SKIN_H */
diff --git a/gui/win32/dialogs.h b/gui/win32/dialogs.h
index d0b52a4965..8ca7ff982d 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 MPLAYER_GUI_DIALOGS_H
+#define MPLAYER_GUI_DIALOGS_H
#define TBS_TOOLTIPS 0x0100
#define WM_SYSTRAY (WM_USER+1)
@@ -131,4 +131,4 @@
#define GTK_MB_WARNING 0x4
#define GTK_MB_SIMPLE 0x8
-#endif /* GUI_DIALOGS_H */
+#endif /* MPLAYER_GUI_DIALOGS_H */
diff --git a/gui/win32/gui.h b/gui/win32/gui.h
index 3c6c245947..b97bc97c69 100644
--- a/gui/win32/gui.h
+++ b/gui/win32/gui.h
@@ -21,8 +21,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef GUI_GUI_H
-#define GUI_GUI_H
+#ifndef MPLAYER_GUI_GUI_H
+#define MPLAYER_GUI_GUI_H
#include "config.h"
#include "mplayer.h"
@@ -117,4 +117,4 @@ extern void display_eqwindow(gui_t *gui);
extern void display_prefswindow(gui_t *gui);
extern void display_opensubtitlewindow(gui_t *gui);
-#endif /* GUI_GUI_H */
+#endif /* MPLAYER_GUI_GUI_H */
diff --git a/gui/win32/playlist.h b/gui/win32/playlist.h
index 38698e78c1..b9181133dd 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 MPLAYER_GUI_PLAYLIST_H
+#define MPLAYER_GUI_PLAYLIST_H
typedef struct
{
@@ -56,4 +56,4 @@ struct playlist_t
extern playlist_t *create_playlist(void);
extern BOOL adddirtoplaylist(playlist_t *playlist, const char* path, BOOL recursive);
-#endif /* GUI_PLAYLIST_H */
+#endif /* MPLAYER_GUI_PLAYLIST_H */
diff --git a/gui/win32/skinload.h b/gui/win32/skinload.h
index 69885f36df..6c9e78e754 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 MPLAYER_GUI_SKINLOAD_H
+#define MPLAYER_GUI_SKINLOAD_H
typedef struct
{
@@ -212,4 +212,4 @@ extern skin_t *loadskin(char *skindir, int desktopbpp);
#define evShowWindow 7004
#define evFirstLoad 7005
-#endif /* GUI_SKINLOAD_H */
+#endif /* MPLAYER_GUI_SKINLOAD_H */
diff --git a/gui/win32/wincfg.h b/gui/win32/wincfg.h
index f55b368aa5..48f15cea10 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 MPLAYER_GUI_WINCFG_H
+#define MPLAYER_GUI_WINCFG_H
extern char *skinName;
extern int sub_window;
@@ -37,4 +37,4 @@ extern int gui_sub_pos_y;
extern int cfg_read(void);
extern int cfg_write(void);
-#endif /* GUI_WINCFG_H */
+#endif /* MPLAYER_GUI_WINCFG_H */
diff --git a/gui/wm/ws.h b/gui/wm/ws.h
index 90b18894b7..ee215ea61c 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 MPLAYER_GUI_WS_H
+#define MPLAYER_GUI_WS_H
#include <X11/Xlib.h>
#include <X11/Xutil.h>
@@ -257,4 +257,4 @@ extern void wsScreenSaverOff( Display * mDisplay );
#define wgIsRect( X,Y,tX,tY,bX,bY ) ( ( (X) > (tX) )&&( (Y) > (tY) )&&( (X) < (bX) )&&( (Y) < (bY) ) )
-#endif /* GUI_WS_H */
+#endif /* MPLAYER_GUI_WS_H */
diff --git a/gui/wm/wskeys.h b/gui/wm/wskeys.h
index 3b7eadc20b..aa39bd6285 100644
--- a/gui/wm/wskeys.h
+++ b/gui/wm/wskeys.h
@@ -1,6 +1,5 @@
-
-#ifndef GUI_WSKEYS_H
-#define GUI_WSKEYS_H
+#ifndef MPLAYER_GUI_WSKEYS_H
+#define MPLAYER_GUI_WSKEYS_H
#define wsKeyNone -1
@@ -161,4 +160,4 @@ typedef struct
extern const TwsKeyNames wsKeyNames[ wsKeyNumber ];
-#endif /* GUI_WSKEYS_H */
+#endif /* MPLAYER_GUI_WSKEYS_H */
diff --git a/gui/wm/wsmkeys.h b/gui/wm/wsmkeys.h
index c016e035d4..4843004161 100644
--- a/gui/wm/wsmkeys.h
+++ b/gui/wm/wsmkeys.h
@@ -1,5 +1,5 @@
-#ifndef GUI_WSMKEYS_H
-#define GUI_WSMKEYS_H
+#ifndef MPLAYER_GUI_WSMKEYS_H
+#define MPLAYER_GUI_WSMKEYS_H
#include "wskeys.h"
@@ -65,4 +65,4 @@ const TwsKeyNames wsKeyNames[ wsKeyNumber ] =
{ wsKeyNone, "None" }
};
-#endif /* GUI_WSMKEYS_H */
+#endif /* MPLAYER_GUI_WSMKEYS_H */
diff --git a/gui/wm/wsxdnd.h b/gui/wm/wsxdnd.h
index 4694d82733..225a7fccec 100644
--- a/gui/wm/wsxdnd.h
+++ b/gui/wm/wsxdnd.h
@@ -1,6 +1,5 @@
-
-#ifndef GUI_WSXDND_H
-#define GUI_WSXDND_H
+#ifndef MPLAYER_GUI_WSXDND_H
+#define MPLAYER_GUI_WSXDND_H
void wsXDNDInitialize(void);
@@ -50,4 +49,4 @@ void wsXDNDClearAwareness(wsTWindow* window);
/* XdndFinished */
#define XDND_FINISHED_TARGET_WIN(e) ((e)->xclient.data.l[0])
-#endif /* GUI_WSXDND_H */
+#endif /* MPLAYER_GUI_WSXDND_H */