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/3rdparty/phonon/waveout | |
| 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/3rdparty/phonon/waveout')
| -rw-r--r-- | src/3rdparty/phonon/waveout/mediaobject.cpp | 2 | ||||
| -rw-r--r-- | src/3rdparty/phonon/waveout/mediaobject.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/phonon/waveout/mediaobject.cpp b/src/3rdparty/phonon/waveout/mediaobject.cpp index 08af4ee..fdd81a7 100644 --- a/src/3rdparty/phonon/waveout/mediaobject.cpp +++ b/src/3rdparty/phonon/waveout/mediaobject.cpp @@ -70,7 +70,7 @@ namespace Phonon } - void CALLBACK MediaObject::WaveOutCallBack(HWAVEOUT m_hWaveOut, UINT uMsg, DWORD dwInstance, DWORD dwParam1, DWORD dwParam2) + void QT_WIN_CALLBACK MediaObject::WaveOutCallBack(HWAVEOUT m_hWaveOut, UINT uMsg, DWORD dwInstance, DWORD dwParam1, DWORD dwParam2) { Q_UNUSED(m_hWaveOut); Q_UNUSED(dwInstance); diff --git a/src/3rdparty/phonon/waveout/mediaobject.h b/src/3rdparty/phonon/waveout/mediaobject.h index dd6b24b..bb1410a 100644 --- a/src/3rdparty/phonon/waveout/mediaobject.h +++ b/src/3rdparty/phonon/waveout/mediaobject.h @@ -112,7 +112,7 @@ namespace Phonon void deleteValidWaveOutDevice(); void playBuffer(WAVEHDR *waveHeader); - static void CALLBACK WaveOutCallBack(HWAVEOUT hWaveOut, UINT uMsg, DWORD dwInstance, DWORD dwParam1, DWORD dwParam2); + static void QT_WIN_CALLBACK WaveOutCallBack(HWAVEOUT hWaveOut, UINT uMsg, DWORD dwInstance, DWORD dwParam1, DWORD dwParam2); struct { WAVEHDR *waveHeader; |