summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-11 23:44:18 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-11 23:44:18 +0000
commit9ec9baa714c9fafc710d4a5dcf30b3ebe0947a41 (patch)
tree2d9d5b102a9985400d741c6e6ab30835c7d9e5ef
parente903257c4609f3de9e6c59ef1c7dfa557f6877ac (diff)
downloadtdemultimedia-9ec9baa714c9fafc710d4a5dcf30b3ebe0947a41.tar.gz
tdemultimedia-9ec9baa714c9fafc710d4a5dcf30b3ebe0947a41.zip
Fix FTBFS on Slackware
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1174323 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--kmix/kmix-platforms.cpp4
-rw-r--r--kmix/mixertoolbox.cpp2
-rw-r--r--libkcddb/kcmcddb/cddbconfigwidget.h2
3 files changed, 8 insertions, 0 deletions
diff --git a/kmix/kmix-platforms.cpp b/kmix/kmix-platforms.cpp
index d0c4d1d..c5a44e0 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 <config.h>
#include <tqstring.h>
@@ -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 857f8d7..ecaf5f9 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 2f0363d..e927284 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 <tqwidget.h>
+
#include "cddbconfigwidgetbase.h"
class CDDBConfigWidget : public CDDBConfigWidgetBase