diff options
103 files changed, 241 insertions, 239 deletions
@@ -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 */ @@ -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 <stdlib.h> #include <stdio.h> 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 <gtk/gtk.h> 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 <gdk/gdkkeysyms.h> #include <gtk/gtk.h> 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 <gtk/gtk.h> 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 <gtk/gtk.h> 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 <gtk/gtk.h> 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 <gtk/gtk.h> 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 <gtk/gtk.h> 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 <gtk/gtk.h> 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 <gtk/gtk.h> 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 <stdio.h> #include <stdlib.h> 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 |