wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-05 12:21:48 +02:00
Code Activity

Fix more -Wundef, in darwin context

Browse source
This commit is contained in:
Robert Hensing 2025-04-05 00:58:07 +02:00
parent 2b51250534
commit ba89da8fa2
17 changed files with 56 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libstore/globals.cc
View file

@ -181,11 +181,11 @@ StringSet Settings::getDefaultSystemFeatures()
actually require anything special on the machines. */
StringSet features{"nixos-test", "benchmark", "big-parallel"};
#if __linux__
#ifdef __linux__
features.insert("uid-range");
#endif
#if __linux__
#ifdef __linux__
if (access("/dev/kvm", R_OK | W_OK) == 0)
features.insert("kvm");
#endif
@ -205,7 +205,7 @@ StringSet Settings::getDefaultExtraPlatforms()
if (std::string{NIX_LOCAL_SYSTEM} == "x86_64-linux" && !isWSL1())
extraPlatforms.insert("i686-linux");
#if __linux__
#ifdef __linux__
StringSet levels = computeLevels();
for (auto iter = levels.begin(); iter != levels.end(); ++iter)
extraPlatforms.insert(*iter + "-linux");
@ -224,7 +224,7 @@ StringSet Settings::getDefaultExtraPlatforms()
bool Settings::isWSL1()
{
#if __linux__
#ifdef __linux__
struct utsname utsbuf;
uname(&utsbuf);
// WSL1 uses -Microsoft suffix