diff -r b72c6db6890b -r 5dc02b23752f src/gui/kernel/qdesktopwidget_win.cpp --- a/src/gui/kernel/qdesktopwidget_win.cpp Wed Jun 23 19:07:03 2010 +0300 +++ b/src/gui/kernel/qdesktopwidget_win.cpp Tue Jul 06 15:10:48 2010 +0300 @@ -76,7 +76,7 @@ }; typedef BOOL (WINAPI *InfoFunc)(HMONITOR, MONITORINFO*); - typedef BOOL (CALLBACK *EnumProc)(HMONITOR, HDC, LPRECT, LPARAM); + typedef BOOL (QT_WIN_CALLBACK *EnumProc)(HMONITOR, HDC, LPRECT, LPARAM); typedef BOOL (WINAPI *EnumFunc)(HDC, LPCRECT, EnumProc, LPARAM); static EnumFunc enumDisplayMonitors; @@ -107,7 +107,7 @@ #endif -BOOL CALLBACK enumCallback(HMONITOR hMonitor, HDC, LPRECT, LPARAM) +BOOL QT_WIN_CALLBACK enumCallback(HMONITOR hMonitor, HDC, LPRECT, LPARAM) { QDesktopWidgetPrivate::screenCount++; QDesktopWidgetPrivate::rects->resize(QDesktopWidgetPrivate::screenCount);