Skip to content

Commit

Permalink
Rename generated version header to avoid conflict on case insensitive…
Browse files Browse the repository at this point in the history
… filesystems

On macOS the compiler was not correctly choosing between the Version.h header from MPD
or the version.h header in mpdclient.
  • Loading branch information
DDRBoxman committed Dec 20, 2023
1 parent 2c85149 commit c6f0bdd
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ version_conf.set_quoted('PACKAGE', meson.project_name())
version_conf.set_quoted('PACKAGE_NAME', meson.project_name())
version_conf.set_quoted('VERSION', meson.project_version())
version_conf.set_quoted('PROTOCOL_VERSION', '0.24.0')
configure_file(output: 'Version.h', configuration: version_conf)
configure_file(output: 'MPDVersion.h', configuration: version_conf)

conf = configuration_data()
conf.set_quoted('SYSTEM_CONFIG_FILE_LOCATION', join_paths(get_option('prefix'), get_option('sysconfdir'), 'mpd.conf'))
Expand Down
2 changes: 1 addition & 1 deletion src/CommandLine.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "cmdline/OptionDef.hxx"
#include "cmdline/OptionParser.hxx"
#include "util/Domain.hxx"
#include "Version.h"
#include "MPDVersion.h"

#ifdef _WIN32
#include "system/Error.hxx"
Expand Down
2 changes: 1 addition & 1 deletion src/LogBackend.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "util/Compiler.h"
#include "util/Domain.hxx"
#include "util/StringStrip.hxx"
#include "Version.h"
#include "MPDVersion.h"
#include "config.h"

#include <cassert>
Expand Down
2 changes: 1 addition & 1 deletion src/client/New.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "net/SocketAddress.hxx"
#include "util/SpanCast.hxx"
#include "Log.hxx"
#include "Version.h"
#include "MPDVersion.h"

#include <cassert>

Expand Down
2 changes: 1 addition & 1 deletion src/db/plugins/simple/DatabaseSave.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "tag/Settings.hxx"
#include "fs/Charset.hxx"
#include "util/StringCompare.hxx"
#include "Version.h"
#include "MPDVersion.h"

#include <fmt/format.h>

Expand Down
2 changes: 1 addition & 1 deletion src/decoder/plugins/MikmodDecoderPlugin.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "fs/Path.hxx"
#include "util/Domain.hxx"
#include "Log.hxx"
#include "Version.h"
#include "MPDVersion.h"

#include <mikmod.h>

Expand Down
2 changes: 1 addition & 1 deletion src/fs/glue/StandardDirectory.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
#endif

#ifdef USE_XDG
#include "Version.h" // for PACKAGE_NAME
#include "MPDVersion.h" // for PACKAGE_NAME
#define APP_FILENAME PATH_LITERAL(PACKAGE_NAME)
static constexpr Path app_filename = Path::FromFS(APP_FILENAME);
#endif
Expand Down
2 changes: 1 addition & 1 deletion src/lib/alsa/Version.cxx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later
// Copyright The Music Player Daemon Project

#include "Version.hxx"
#include "version.hxx"

#include <alsa/asoundlib.h>

Expand Down
2 changes: 1 addition & 1 deletion src/lib/curl/Setup.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include "Setup.hxx"
#include "Easy.hxx"
#include "Version.h"
#include "MPDVersion.h"

namespace Curl {

Expand Down

0 comments on commit c6f0bdd

Please sign in to comment.