diff options
author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-03-11 10:39:37 (GMT) |
---|---|---|
committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-03-11 10:41:19 (GMT) |
commit | 6e25e8b7857de7f688c673ba700384f85b4113d4 (patch) | |
tree | 9b6edff63cc7d34423ddebea5879210a1c1a5a88 /src/gui/kernel/qdesktopwidget_win.cpp | |
parent | 8404d073d0a8f02d77888496986cba7c0b1b1739 (diff) | |
download | Qt-6e25e8b7857de7f688c673ba700384f85b4113d4.zip Qt-6e25e8b7857de7f688c673ba700384f85b4113d4.tar.gz Qt-6e25e8b7857de7f688c673ba700384f85b4113d4.tar.bz2 |
make it possible to use sse2 with mingw
All the windows callback functions need an attribute to force the
alignment of the arg pointer.
Reviewed-by: Benjamin Poulain
Diffstat (limited to 'src/gui/kernel/qdesktopwidget_win.cpp')
-rw-r--r-- | src/gui/kernel/qdesktopwidget_win.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qdesktopwidget_win.cpp b/src/gui/kernel/qdesktopwidget_win.cpp index 1fea8d6..07dbc24 100644 --- a/src/gui/kernel/qdesktopwidget_win.cpp +++ b/src/gui/kernel/qdesktopwidget_win.cpp @@ -76,7 +76,7 @@ public: }; 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 @@ static inline void qt_get_sip_info(QRect &rect) #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); |