From 98d75de1ea00b31cdff9a22e881ac01be5ac2ae9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 5 Jan 2025 19:02:28 +0000
Subject: [PATCH] windows: fix conditional compilation variable

---
 src/libstore/windows/pathlocks.cc            | 2 +-
 src/libutil/windows/environment-variables.cc | 2 +-
 src/libutil/windows/file-descriptor.cc       | 2 +-
 src/libutil/windows/file-system.cc           | 2 +-
 src/libutil/windows/muxable-pipe.cc          | 2 +-
 src/libutil/windows/os-string.cc             | 2 +-
 src/libutil/windows/processes.cc             | 2 +-
 src/libutil/windows/users.cc                 | 2 +-
 src/libutil/windows/windows-async-pipe.cc    | 2 +-
 src/libutil/windows/windows-async-pipe.hh    | 2 +-
 src/libutil/windows/windows-error.cc         | 2 +-
 src/libutil/windows/windows-error.hh         | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/libstore/windows/pathlocks.cc b/src/libstore/windows/pathlocks.cc
index 197f5a1c4..29a98d8e2 100644
--- 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
index 308a432e4..d1093597c 100644
--- 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
index 71f53ccb8..e2a473a7c 100644
--- 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
index 53271cef3..7ed1c04a6 100644
--- 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
index af7e987e9..ac2882120 100644
--- 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
index 26ad9cba0..b09ef8b90 100644
--- 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
index e69f1ed45..fd4d7c43a 100644
--- 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
index 2780e45f4..438c4221c 100644
--- 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
index 13b563510..4e139d5cf 100644
--- 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
index 277336ed7..53715e260 100644
--- 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
index 4cf4274da..b92f9155f 100644
--- 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
index 4e48ee859..66c67b43a 100644
--- 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"