From 9ec9baa714c9fafc710d4a5dcf30b3ebe0947a41 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 11 Sep 2010 23:44:18 +0000 Subject: Fix FTBFS on Slackware git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1174323 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kmix/kmix-platforms.cpp | 4 ++++ kmix/mixertoolbox.cpp | 2 ++ libkcddb/kcmcddb/cddbconfigwidget.h | 2 ++ 3 files changed, 8 insertions(+) diff --git a/kmix/kmix-platforms.cpp b/kmix/kmix-platforms.cpp index d0c4d1d5..c5a44e01 100644 --- a/kmix/kmix-platforms.cpp +++ b/kmix/kmix-platforms.cpp @@ -22,6 +22,9 @@ /* This code is being #include'd from mixer.cpp */ +#ifndef KMIX_PLATFORMS_CPP +#define KMIX_PLATFORMS_CPP + #include #include @@ -149,3 +152,4 @@ MixerFactory g_mixerFactories[] = { { NULL, NULL, NULL } }; +#endif // KMIX_PLATFORMS_CPP diff --git a/kmix/mixertoolbox.cpp b/kmix/mixertoolbox.cpp index 857f8d79..ecaf5f9d 100644 --- a/kmix/mixertoolbox.cpp +++ b/kmix/mixertoolbox.cpp @@ -29,6 +29,8 @@ #include "mixdevice.h" #include "mixer.h" +#include "kmix-platforms.cpp" + #include "mixertoolbox.h" /*********************************************************************************** diff --git a/libkcddb/kcmcddb/cddbconfigwidget.h b/libkcddb/kcmcddb/cddbconfigwidget.h index 2f0363d7..e927284c 100644 --- a/libkcddb/kcmcddb/cddbconfigwidget.h +++ b/libkcddb/kcmcddb/cddbconfigwidget.h @@ -20,6 +20,8 @@ #ifndef CDDB_CONFIG_WIDGET_H #define CDDB_CONFIG_WIDGET_H +#include + #include "cddbconfigwidgetbase.h" class CDDBConfigWidget : public CDDBConfigWidgetBase -- cgit v1.2.3