Mercurial > mplayer.hg

changeset 23685:f15bce7943b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add consistent GUI prefix to multiple inclusion guards.
author diego
date Mon, 02 Jul 2007 20:55:05 +0000
parents 39da13b211b6
children e26d1367fa1d
files gui/app.h gui/bitmap.h gui/cfg.h gui/interface.h gui/mplayer/common.h gui/mplayer/gmplayer.h gui/mplayer/gtk/common.h gui/mplayer/gtk/opts.h gui/mplayer/gtk/url.h gui/mplayer/widgets.h gui/skin/cut.h gui/skin/font.h gui/skin/skin.h gui/win32/dialogs.h gui/win32/gui.h gui/win32/playlist.h gui/win32/skinload.h gui/win32/wincfg.h gui/wm/ws.h gui/wm/wskeys.h gui/wm/wsxdnd.h
diffstat 21 files changed, 43 insertions(+), 43 deletions(-) [+]
line wrap: on
line diff
--- a/gui/app.h	Mon Jul 02 20:54:11 2007 +0000
+++ b/gui/app.h	Mon Jul 02 20:55:05 2007 +0000
@@ -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"
--- a/gui/bitmap.h	Mon Jul 02 20:54:11 2007 +0000
+++ b/gui/bitmap.h	Mon Jul 02 20:55:05 2007 +0000
@@ -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 @@
 int bpRead( char * fname, txSample * bf );
 void Convert32to1( txSample * in,txSample * out,int adaptivlimit );
 
-#endif /* __BITMAP_H */
+#endif /* __GUI_BITMAP_H */
--- a/gui/cfg.h	Mon Jul 02 20:54:11 2007 +0000
+++ b/gui/cfg.h	Mon Jul 02 20:55:05 2007 +0000
@@ -1,6 +1,6 @@
 
-#ifndef __CFG_H
-#define __CFG_H
+#ifndef __GUI_CFG_H
+#define __GUI_CFG_H
 
 extern int gtkEnableAudioEqualizer;
 
--- a/gui/interface.h	Mon Jul 02 20:54:11 2007 +0000
+++ b/gui/interface.h	Mon Jul 02 20:55:05 2007 +0000
@@ -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"
--- a/gui/mplayer/common.h	Mon Jul 02 20:54:11 2007 +0000
+++ b/gui/mplayer/common.h	Mon Jul 02 20:55:05 2007 +0000
@@ -1,5 +1,5 @@
-#ifndef __COMMON_H
-#define __COMMON_H
+#ifndef __GUI_COMMON_H
+#define __GUI_COMMON_H
 
 #include <stdlib.h>
 #include <stdio.h>
--- a/gui/mplayer/gmplayer.h	Mon Jul 02 20:54:11 2007 +0000
+++ b/gui/mplayer/gmplayer.h	Mon Jul 02 20:55:05 2007 +0000
@@ -1,6 +1,6 @@
 
-#ifndef __GMPLAYER_H
-#define __GMPLAYER_H
+#ifndef __GUI_GMPLAYER_H
+#define __GUI_GMPLAYER_H
 
 extern int             mplSubRender;
 extern int             mplMainRender;
--- a/gui/mplayer/gtk/common.h	Mon Jul 02 20:54:11 2007 +0000
+++ b/gui/mplayer/gtk/common.h	Mon Jul 02 20:55:05 2007 +0000
@@ -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>
--- a/gui/mplayer/gtk/opts.h	Mon Jul 02 20:54:11 2007 +0000
+++ b/gui/mplayer/gtk/opts.h	Mon Jul 02 20:55:05 2007 +0000
@@ -1,6 +1,6 @@
 
-#ifndef __OPTS_H
-#define __OPTS_H
+#ifndef __GUI_OPTS_H
+#define __GUI_OPTS_H
 
 #include <gtk/gtk.h>
 
--- a/gui/mplayer/gtk/url.h	Mon Jul 02 20:54:11 2007 +0000
+++ b/gui/mplayer/gtk/url.h	Mon Jul 02 20:55:05 2007 +0000
@@ -1,6 +1,6 @@
 
-#ifndef _URL_H
-#define _URL_H
+#ifndef _GUI_URL_H
+#define _GUI_URL_H
 
 extern GtkWidget * URL;
 extern int         gtkVURLDialogBox;
--- a/gui/mplayer/widgets.h	Mon Jul 02 20:54:11 2007 +0000
+++ b/gui/mplayer/widgets.h	Mon Jul 02 20:55:05 2007 +0000
@@ -1,6 +1,6 @@
 
-#ifndef __WIDGETS_H
-#define __WIDGETS_H
+#ifndef __GUI_WIDGETS_H
+#define __GUI_WIDGETS_H
 
 #include <stdio.h>
 #include <stdlib.h>
--- a/gui/skin/cut.h	Mon Jul 02 20:54:11 2007 +0000
+++ b/gui/skin/cut.h	Mon Jul 02 20:55:05 2007 +0000
@@ -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 );
--- a/gui/skin/font.h	Mon Jul 02 20:54:11 2007 +0000
+++ b/gui/skin/font.h	Mon Jul 02 20:55:05 2007 +0000
@@ -1,6 +1,6 @@
 
-#ifndef _FONT_H
-#define _FONT_H
+#ifndef _GUI_FONT_H
+#define _GUI_FONT_H
 
 #include "bitmap.h"
 #include "app.h"
--- a/gui/skin/skin.h	Mon Jul 02 20:54:11 2007 +0000
+++ b/gui/skin/skin.h	Mon Jul 02 20:55:05 2007 +0000
@@ -1,6 +1,6 @@
 
-#ifndef __SKIN_H
-#define __SKIN_H
+#ifndef __GUI_SKIN_H
+#define __GUI_SKIN_H
 
 #include "app.h"
 
--- a/gui/win32/dialogs.h	Mon Jul 02 20:54:11 2007 +0000
+++ b/gui/win32/dialogs.h	Mon Jul 02 20:55:05 2007 +0000
@@ -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)
--- a/gui/win32/gui.h	Mon Jul 02 20:54:11 2007 +0000
+++ b/gui/win32/gui.h	Mon Jul 02 20:55:05 2007 +0000
@@ -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"
--- a/gui/win32/playlist.h	Mon Jul 02 20:54:11 2007 +0000
+++ b/gui/win32/playlist.h	Mon Jul 02 20:55:05 2007 +0000
@@ -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
 {
--- a/gui/win32/skinload.h	Mon Jul 02 20:54:11 2007 +0000
+++ b/gui/win32/skinload.h	Mon Jul 02 20:55:05 2007 +0000
@@ -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
 {
--- a/gui/win32/wincfg.h	Mon Jul 02 20:54:11 2007 +0000
+++ b/gui/win32/wincfg.h	Mon Jul 02 20:55:05 2007 +0000
@@ -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;
--- a/gui/wm/ws.h	Mon Jul 02 20:54:11 2007 +0000
+++ b/gui/wm/ws.h	Mon Jul 02 20:55:05 2007 +0000
@@ -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>
--- a/gui/wm/wskeys.h	Mon Jul 02 20:54:11 2007 +0000
+++ b/gui/wm/wskeys.h	Mon Jul 02 20:55:05 2007 +0000
@@ -1,6 +1,6 @@
 
-#ifndef _WSKEYS_H
-#define _WSKEYS_H
+#ifndef _GUI_WSKEYS_H
+#define _GUI_WSKEYS_H
 
 #define wsKeyNone -1
 
--- a/gui/wm/wsxdnd.h	Mon Jul 02 20:54:11 2007 +0000
+++ b/gui/wm/wsxdnd.h	Mon Jul 02 20:55:05 2007 +0000
@@ -1,6 +1,6 @@
 
-#ifndef _WSXDND_H
-#define _WSXDND_H
+#ifndef _GUI_WSXDND_H
+#define _GUI_WSXDND_H
 
 
 void wsXDNDInitialize(void);