Skip to content

Commit 70db93e

Browse files
Merge pull request mixxxdj#15889 from Partmedia/bsd
Adjust ifdefs for FreeBSD
2 parents 77d4929 + 481d278 commit 70db93e

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

src/util/battery/battery.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
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);

src/util/cmdlineargs.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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

0 commit comments

Comments
 (0)