Merge pull request #12137 from Mic92/windows

Ericson2314 · web-flow · commit daab4d18aca6 · 2025-01-05T19:18:49.000-05:00
windows: fix conditional compilation variable
diff --git a/src/libstore/windows/pathlocks.cc b/src/libstore/windows/pathlocks.cc
@@ -3,7 +3,7 @@
 #include "signals.hh"
 #include "util.hh"
 
-#ifdef WIN32
+#ifdef _WIN32
 #  include <errhandlingapi.h>
 #  include <fileapi.h>
 #  include <windows.h>
diff --git a/src/libutil/windows/environment-variables.cc b/src/libutil/windows/environment-variables.cc
@@ -1,6 +1,6 @@
 #include "environment-variables.hh"
 
-#ifdef WIN32
+#ifdef _WIN32
 #  include "processenv.h"
 
 namespace nix {
diff --git a/src/libutil/windows/file-descriptor.cc b/src/libutil/windows/file-descriptor.cc
@@ -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>
diff --git a/src/libutil/windows/file-system.cc b/src/libutil/windows/file-system.cc
@@ -1,6 +1,6 @@
 #include "file-system.hh"
 
-#ifdef WIN32
+#ifdef _WIN32
 namespace nix {
 
 Descriptor openDirectory(const std::filesystem::path & path)
diff --git a/src/libutil/windows/muxable-pipe.cc b/src/libutil/windows/muxable-pipe.cc
@@ -1,4 +1,4 @@
-#ifdef WIN32
+#ifdef _WIN32
 #  include <ioapiset.h>
 #  include "windows-error.hh"
 
diff --git a/src/libutil/windows/os-string.cc b/src/libutil/windows/os-string.cc
@@ -7,7 +7,7 @@
 #include "file-path-impl.hh"
 #include "util.hh"
 
-#ifdef WIN32
+#ifdef _WIN32
 
 namespace nix {
 
diff --git a/src/libutil/windows/processes.cc b/src/libutil/windows/processes.cc
@@ -23,7 +23,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
diff --git a/src/libutil/windows/users.cc b/src/libutil/windows/users.cc
@@ -4,7 +4,7 @@
 #include "file-system.hh"
 #include "windows-error.hh"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
diff --git a/src/libutil/windows/windows-async-pipe.cc b/src/libutil/windows/windows-async-pipe.cc
@@ -1,7 +1,7 @@
 #include "windows-async-pipe.hh"
 #include "windows-error.hh"
 
-#ifdef WIN32
+#ifdef _WIN32
 
 namespace nix::windows {
 
diff --git a/src/libutil/windows/windows-async-pipe.hh b/src/libutil/windows/windows-async-pipe.hh
@@ -2,7 +2,7 @@
 ///@file
 
 #include "file-descriptor.hh"
-#ifdef WIN32
+#ifdef _WIN32
 
 namespace nix::windows {
 
diff --git a/src/libutil/windows/windows-error.cc b/src/libutil/windows/windows-error.cc
@@ -1,6 +1,6 @@
 #include "windows-error.hh"
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <error.h>
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
diff --git a/src/libutil/windows/windows-error.hh b/src/libutil/windows/windows-error.hh
@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <errhandlingapi.h>
 
 #include "error.hh"
diff --git a/src/nix/flake.cc b/src/nix/flake.cc
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#ifdef WIN32`
	`1`	`+#ifdef _WIN32`
`2`	`2`	`# include <ioapiset.h>`
`3`	`3`	`# include "windows-error.hh"`
`4`	`4`