[MPlayer-dev-eng] [PATCH] gui/win32/dialogs.c

[Stephen Sheldon]

The newly named function "gui" conflicts with the variable "gui" in
gui/win32/dialogs.c.

Here is the error:

gui/win32/dialogs.c: In function 'SkinBrowserWndProc':
gui/win32/dialogs.c:711:49: error: called object 'gui' is not a function
make: *** [gui/win32/dialogs.o] Error 1

Here is a patch:

Index: gui/win32/dialogs.c
===================================================================
--- gui/win32/dialogs.c	(revision 33822)
+++ gui/win32/dialogs.c	(working copy)
@@ -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 */
                     }
                 }