# HG changeset patch # User ib # Date 1309884652 0 # Node ID 84defaf2e7f813c78b7162007e93a02d8fc1fbeb # Parent 1fbe7adc4eaf73759a74802a0db72ec9c1ca91a6 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. diff -r 1fbe7adc4eaf -r 84defaf2e7f8 gui/win32/dialogs.c --- 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 */ } }