File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1111#include " util/battery/batterywindows.h"
1212#elif defined(__APPLE__)
1313#include " util/battery/batterymac.h"
14- #else
14+ #elif __LINUX__
1515#include " util/battery/batterylinux.h"
1616#endif
1717#endif
@@ -37,8 +37,11 @@ Battery* Battery::getBattery(QObject* parent) {
3737 return new BatteryWindows (parent);
3838#elif defined(Q_OS_MAC)
3939 return new BatteryMac (parent);
40- #else
40+ #elif __LINUX__
4141 return new BatteryLinux (parent);
42+ #else
43+ Q_UNUSED (parent);
44+ return nullptr ;
4245#endif
4346#else
4447 Q_UNUSED (parent);
Original file line number Diff line number Diff line change @@ -70,7 +70,7 @@ CmdlineArgs::CmdlineArgs()
7070 m_logFlushLevel(mixxx::kLogFlushLevelDefault ),
7171 m_logMaxFileSize(mixxx::kLogMaxFileSizeDefault ),
7272// We are not ready to switch to XDG folders under Linux, so keeping $HOME/.mixxx as preferences folder. see #8090
73- #if defined(__LINUX__)
73+ #if defined(__LINUX__) || defined(__BSD__)
7474#ifdef MIXXX_SETTINGS_PATH
7575 m_settingsPath (QDir::homePath().append(" /" ).append(MIXXX_SETTINGS_PATH ))
7676#else
You can’t perform that action at this time.
0 commit comments