diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-04-15 10:23:57 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-04-15 10:23:57 (GMT) |
| commit | e4282111378ce67a1ae9c235efbd89b327f1bb91 (patch) | |
| tree | 175fca0d6b40940f8bcba61e4b6563145f5dde70 /src/3rdparty/phonon/ds9/qaudiocdreader.h | |
| parent | 114cb018c088570ff0640eeb0d57594905ff9fcf (diff) | |
| parent | b1c8bdc899cd276fcb90ad424b128bd7d8a21e21 (diff) | |
| download | Qt-e4282111378ce67a1ae9c235efbd89b327f1bb91.zip Qt-e4282111378ce67a1ae9c235efbd89b327f1bb91.tar.gz Qt-e4282111378ce67a1ae9c235efbd89b327f1bb91.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/3rdparty/phonon/ds9/qaudiocdreader.h')
| -rw-r--r-- | src/3rdparty/phonon/ds9/qaudiocdreader.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/ds9/qaudiocdreader.h b/src/3rdparty/phonon/ds9/qaudiocdreader.h index 9049b66..eff845d 100644 --- a/src/3rdparty/phonon/ds9/qaudiocdreader.h +++ b/src/3rdparty/phonon/ds9/qaudiocdreader.h @@ -31,7 +31,7 @@ namespace Phonon { struct CDROM_TOC; struct WaveStructure; - extern const IID IID_ITitleInterface; + EXTERN_C const IID IID_ITitleInterface; //interface for the Titles struct ITitleInterface : public IUnknown |