diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-14 12:55:02 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-14 12:55:02 +0000 |
| commit | 93e9e860d75ac0e4e449716cfb65518e14409d4f (patch) | |
| tree | 4227d0f2537aefe75abadd3aa26ff238902bdbb1 /gui/mplayer/widgets.c | |
| parent | 89dfec20a2ec4b264d3f89dba37694b856d4cebf (diff) | |
| download | mpv-93e9e860d75ac0e4e449716cfb65518e14409d4f.tar.bz2 mpv-93e9e860d75ac0e4e449716cfb65518e14409d4f.tar.xz | |
Rename gui/mplayer/gtk/menu.[ch] --> gui/mplayer/gtk/gtkmenu.[ch].
This avoids confusion with headers of the same name in other places.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30573 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'gui/mplayer/widgets.c')
| -rw-r--r-- | gui/mplayer/widgets.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gui/mplayer/widgets.c b/gui/mplayer/widgets.c index d6b0442303..0acc1f325c 100644 --- a/gui/mplayer/widgets.c +++ b/gui/mplayer/widgets.c @@ -41,7 +41,6 @@ #include "gui/wm/ws.h" -#include "gtk/menu.h" #include "play.h" #include "gtk/fs.h" @@ -60,7 +59,7 @@ int gtkInitialized = 0; #include "gtk/mb.h" #include "gtk/about.h" #include "gtk/opts.h" -#include "gtk/menu.h" +#include "gtk/gtk_menu.h" #include "gtk/gtk_url.h" #include "gtk/eq.h" |