Changeset 1387 for trunk/BAL/Media/WebCore/Phonon/BCMediaPlayerPrivatePhonon.cpp

Timestamp:

02/25/10 16:02:57 (7 months ago)

Author:

gpenin

Message:

merge with webkit revision 55226

Files:

• trunk/BAL/Media/WebCore/Phonon/BCMediaPlayerPrivatePhonon.cpp (modified) (2 diffs)

trunk/BAL/Media/WebCore/Phonon/BCMediaPlayerPrivatePhonon.cpp

@@ -18 +18 @@
-    Boston, MA 02110-1301, USA.
-*/
+
+#ifdef WTF_USE_VIDEO_PHONON
-
-#include "config.h"
@@ -534 +536 @@
-
-#include "MediaPlayerPrivatePhonon.moc"
+
+#endif // WTF_USE_VIDEO_PHONON