Mercurial > mplayer.hg

changeset 33735:84defaf2e7f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compilation of the Win32 GUI after r33812. The newly named function gui() conflicts with a variable "gui". Patch by Stephen Sheldon, sfsheldo gmail com.
author ib
date Tue, 05 Jul 2011 16:50:52 +0000
parents 1fbe7adc4eaf
children a5a54c7a15ce
files gui/win32/dialogs.c
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/gui/win32/dialogs.c	Tue Jul 05 15:04:00 2011 +0000
+++ b/gui/win32/dialogs.c	Tue Jul 05 16:50:52 2011 +0000
@@ -662,7 +662,7 @@
 {
     static HWND listbox;
     static char skinspath[MAX_PATH];
-    gui_t* gui = (gui_t*) GetWindowLongPtr(hwnd, GWLP_USERDATA);
+    gui_t* mygui = (gui_t*) GetWindowLongPtr(hwnd, GWLP_USERDATA);
     switch (iMsg)
     {
         case WM_CREATE:
@@ -718,9 +718,9 @@
                         strcat(skinspath, skinName);
                         ShowWindow(hwnd, SW_HIDE);
                         Shell_NotifyIcon(NIM_DELETE, &nid);
-                        destroy_window(gui);
-                        create_window(gui, skinspath);
-                        create_subwindow(gui, skinspath);
+                        destroy_window(mygui);
+                        create_window(mygui, skinspath);
+                        create_subwindow(mygui, skinspath);
                         SendMessage(hwnd, WM_CLOSE, 0, 0); /* Avoid crashing when switching skin */
                     }
                 }