Add consistent GUI prefix to multiple inclusion guards.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23705 b3059339-0415-0410-9bf9-f77b7e298cf2

21 files changed, 43 insertions, 43 deletions

diff --git a/gui/app.h b/gui/app.h
index 37ea354c91..523bfad01f 100644
--- a/gui/app.h
+++ b/gui/app.h
@@ -1,6 +1,6 @@
 
-#ifndef __APP_H
-#define __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 94bc07546c..3661a29667 100644
--- a/gui/bitmap.h
+++ b/gui/bitmap.h
@@ -1,5 +1,5 @@
-#ifndef __BITMAP_H
-#define __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 /* __BITMAP_H */
+#endif /* __GUI_BITMAP_H */
diff --git a/gui/cfg.h b/gui/cfg.h
index f78e983524..b0ce17cd2d 100644
--- a/gui/cfg.h
+++ b/gui/cfg.h
@@ -1,6 +1,6 @@
 
-#ifndef __CFG_H
-#define __CFG_H
+#ifndef __GUI_CFG_H
+#define __GUI_CFG_H
 
 extern int gtkEnableAudioEqualizer;
 
diff --git a/gui/interface.h b/gui/interface.h
index 2b14ba2362..4c5ed2bb7a 100644
--- a/gui/interface.h
+++ b/gui/interface.h
@@ -1,6 +1,6 @@
 
-#ifndef _INTERFACE_H
-#define _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 4cc6c7e152..3353a41a70 100644
--- a/gui/mplayer/common.h
+++ b/gui/mplayer/common.h
@@ -1,5 +1,5 @@
-#ifndef __COMMON_H
-#define __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 e7adae7d24..caa9297532 100644
--- a/gui/mplayer/gmplayer.h
+++ b/gui/mplayer/gmplayer.h
@@ -1,6 +1,6 @@
 
-#ifndef __GMPLAYER_H
-#define __GMPLAYER_H
+#ifndef __GUI_GMPLAYER_H
+#define __GUI_GMPLAYER_H
 
 extern int             mplSubRender;
 extern int             mplMainRender;
diff --git a/gui/mplayer/gtk/common.h b/gui/mplayer/gtk/common.h
index d68a977622..6547b27119 100644
--- a/gui/mplayer/gtk/common.h
+++ b/gui/mplayer/gtk/common.h
@@ -1,6 +1,6 @@
 
-#ifndef __COMMON_H
-#define __COMMON_H
+#ifndef __GUI_COMMON_H
+#define __GUI_COMMON_H
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
diff --git a/gui/mplayer/gtk/opts.h b/gui/mplayer/gtk/opts.h
index 6bb7069a55..4305938017 100644
--- a/gui/mplayer/gtk/opts.h
+++ b/gui/mplayer/gtk/opts.h
@@ -1,6 +1,6 @@
 
-#ifndef __OPTS_H
-#define __OPTS_H
+#ifndef __GUI_OPTS_H
+#define __GUI_OPTS_H
 
 #include <gtk/gtk.h>
 
diff --git a/gui/mplayer/gtk/url.h b/gui/mplayer/gtk/url.h
index ed0a656586..15b8914b72 100644
--- a/gui/mplayer/gtk/url.h
+++ b/gui/mplayer/gtk/url.h
@@ -1,6 +1,6 @@
 
-#ifndef _URL_H
-#define _URL_H
+#ifndef _GUI_URL_H
+#define _GUI_URL_H
 
 extern GtkWidget * URL;
 extern int         gtkVURLDialogBox;
diff --git a/gui/mplayer/widgets.h b/gui/mplayer/widgets.h
index a9bd6df37f..4c1c179c78 100644
--- a/gui/mplayer/widgets.h
+++ b/gui/mplayer/widgets.h
@@ -1,6 +1,6 @@
 
-#ifndef __WIDGETS_H
-#define __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 71862e91f9..1283c75c5b 100644
--- a/gui/skin/cut.h
+++ b/gui/skin/cut.h
@@ -1,6 +1,6 @@
 
-#ifndef _CUT_H
-#define _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 94289ded6c..461b291339 100644
--- a/gui/skin/font.h
+++ b/gui/skin/font.h
@@ -1,6 +1,6 @@
 
-#ifndef _FONT_H
-#define _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 1a2a26e8b9..2dfd461c6f 100644
--- a/gui/skin/skin.h
+++ b/gui/skin/skin.h
@@ -1,6 +1,6 @@
 
-#ifndef __SKIN_H
-#define __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 77d1644118..ba611c97e3 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 _DIALOGS_H
-#define _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 fa11fdb073..f6fb98059c 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_H
-#define _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 bc502dbc6c..a534a7f77a 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 _PLAYLIST_H
-#define _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 50576e4aae..2ac0cd6fd8 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 _SKINLOAD_H
-#define _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 20a4511ff2..bddb41988c 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 _WINCFG_H
-#define _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 724d1c7482..25d77f0da3 100644
--- a/gui/wm/ws.h
+++ b/gui/wm/ws.h
@@ -4,8 +4,8 @@
 //   Writed by pontscho / fresh!mindworkz
 // ----------------------------------------------------------------------------------------------
 
-#ifndef __WS_H
-#define __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 837b9b191a..8ffdb6ca21 100644
--- a/gui/wm/wskeys.h
+++ b/gui/wm/wskeys.h
@@ -1,6 +1,6 @@
 
-#ifndef _WSKEYS_H
-#define _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 df87b2b9c5..4e400d030a 100644
--- a/gui/wm/wsxdnd.h
+++ b/gui/wm/wsxdnd.h
@@ -1,6 +1,6 @@
 
-#ifndef _WSXDND_H
-#define _WSXDND_H
+#ifndef _GUI_WSXDND_H
+#define _GUI_WSXDND_H
 
 
 void wsXDNDInitialize(void);