wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 02:21:16 +02:00
Code Activity

Merge pull request #12137 from Mic92/windows

Browse source 
windows: fix conditional compilation variable
This commit is contained in:
John Ericson 2025-01-05 19:18:49 -05:00 • committed by GitHub
commit daab4d18ac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/windows/pathlocks.cc
View file

@ -3,7 +3,7 @@
#include "signals.hh"
#include "util.hh"
#ifdef WIN32
#ifdef _WIN32
# include <errhandlingapi.h>
# include <fileapi.h>
# include <windows.h>

2
src/libutil/windows/environment-variables.cc
View file

@ -1,6 +1,6 @@
#include "environment-variables.hh"
#ifdef WIN32
#ifdef _WIN32
# include "processenv.h"
namespace nix {

2
src/libutil/windows/file-descriptor.cc
View file

@ -5,7 +5,7 @@
#include "windows-error.hh"
#include "file-path.hh"
#ifdef WIN32
#ifdef _WIN32
#include <fileapi.h>
#include <error.h>
#include <namedpipeapi.h>

2
src/libutil/windows/file-system.cc
View file

@ -1,6 +1,6 @@
#include "file-system.hh"
#ifdef WIN32
#ifdef _WIN32
namespace nix {
Descriptor openDirectory(const std::filesystem::path & path)

2
src/libutil/windows/muxable-pipe.cc
View file

@ -1,4 +1,4 @@
#ifdef WIN32
#ifdef _WIN32
# include <ioapiset.h>
# include "windows-error.hh"

2
src/libutil/windows/os-string.cc
View file

@ -7,7 +7,7 @@
#include "file-path-impl.hh"
#include "util.hh"
#ifdef WIN32
#ifdef _WIN32
namespace nix {

2
src/libutil/windows/processes.cc
View file

@ -23,7 +23,7 @@
#include <sys/types.h>
#include <unistd.h>
#ifdef WIN32
#ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>

2
src/libutil/windows/users.cc
View file

@ -4,7 +4,7 @@
#include "file-system.hh"
#include "windows-error.hh"
#ifdef WIN32
#ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>

2
src/libutil/windows/windows-async-pipe.cc
View file

@ -1,7 +1,7 @@
#include "windows-async-pipe.hh"
#include "windows-error.hh"
#ifdef WIN32
#ifdef _WIN32
namespace nix::windows {

2
src/libutil/windows/windows-async-pipe.hh
View file

@ -2,7 +2,7 @@
///@file
#include "file-descriptor.hh"
#ifdef WIN32
#ifdef _WIN32
namespace nix::windows {

2
src/libutil/windows/windows-error.cc
View file

@ -1,6 +1,6 @@
#include "windows-error.hh"
#ifdef WIN32
#ifdef _WIN32
#include <error.h>
#define WIN32_LEAN_AND_MEAN
#include <windows.h>

2
src/libutil/windows/windows-error.hh
View file

@ -1,7 +1,7 @@
#pragma once
///@file
#ifdef WIN32
#ifdef _WIN32
#include <errhandlingapi.h>
#include "error.hh"

2
src/nix/flake.cc
View file

@ -938,7 +938,7 @@ struct CmdFlakeInitCommon : virtual Args, EvalCommand
}
continue;
} else
createSymlink(target, to2);
createSymlink(target, os_string_to_string(PathViewNG { to2 }));
}
else
throw Error("file '%s' has unsupported type", from2);