summaryrefslogtreecommitdiffstats
path: root/src/activeqt
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2010-03-11 10:39:37 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2010-03-11 10:41:19 (GMT)
commit6e25e8b7857de7f688c673ba700384f85b4113d4 (patch)
tree9b6edff63cc7d34423ddebea5879210a1c1a5a88 /src/activeqt
parent8404d073d0a8f02d77888496986cba7c0b1b1739 (diff)
downloadQt-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/activeqt')
-rw-r--r--src/activeqt/control/qaxserverbase.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/activeqt/control/qaxserverbase.cpp b/src/activeqt/control/qaxserverbase.cpp
index ce71490..ca16b39 100644
--- a/src/activeqt/control/qaxserverbase.cpp
+++ b/src/activeqt/control/qaxserverbase.cpp
@@ -160,7 +160,7 @@ public:
void createMenu(QMenuBar *menuBar);
void removeMenu();
- static LRESULT CALLBACK ActiveXProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+ static LRESULT QT_WIN_CALLBACK ActiveXProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
// Object registration with OLE
void registerActiveObject(IUnknown *object);
@@ -764,7 +764,7 @@ private:
};
// callback for DLL server to hook into non-Qt eventloop
-LRESULT CALLBACK axs_FilterProc(int nCode, WPARAM wParam, LPARAM lParam)
+LRESULT QT_WIN_CALLBACK axs_FilterProc(int nCode, WPARAM wParam, LPARAM lParam)
{
if (qApp && !invokeCount)
qApp->sendPostedEvents();
@@ -1350,7 +1350,7 @@ class HackWidget : public QWidget
The semantics of \a wParam and \a lParam depend on the value of \a uMsg.
*/
-LRESULT CALLBACK QAxServerBase::ActiveXProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+LRESULT QT_WIN_CALLBACK QAxServerBase::ActiveXProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
if (uMsg == WM_CREATE) {
CREATESTRUCT *cs = (CREATESTRUCT*)lParam;