[MPlayer-cvslog] r33823 - trunk/gui/win32/dialogs.c

[ib]

Author: ib
Date: Tue Jul  5 18:50:52 2011
New Revision: 33823

Log:
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.

Modified:
   trunk/gui/win32/dialogs.c

Modified: trunk/gui/win32/dialogs.c
==============================================================================
--- trunk/gui/win32/dialogs.c	Tue Jul  5 17:04:00 2011	(r33822)
+++ trunk/gui/win32/dialogs.c	Tue Jul  5 18:50:52 2011	(r33823)
@@ -662,7 +662,7 @@ static LRESULT CALLBACK SkinBrowserWndPr
 {
     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 @@ static LRESULT CALLBACK SkinBrowserWndPr
                         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 */
                     }
                 }