1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 10:41:16 +02:00

libutil/windows: only define headers/code if we are actually on windows

all those includes otherwise break linters.
This commit is contained in:
Jörg Thalheim 2024-12-16 12:43:28 +01:00
parent b9bbdbeb0b
commit eda331e53f
13 changed files with 43 additions and 12 deletions

View file

@ -4,8 +4,8 @@
// inluding the generated headers twice leads to errors
#ifndef BISON_HEADER
#include "lexer-tab.hh"
#include "parser-tab.hh"
# include "lexer-tab.hh"
# include "parser-tab.hh"
#endif
namespace nix::lexer::internal {

View file

@ -2,10 +2,12 @@
#include "pathlocks.hh"
#include "signals.hh"
#include "util.hh"
#include <errhandlingapi.h>
#include <fileapi.h>
#include <windows.h>
#include "windows-error.hh"
#ifdef WIN32
# include <errhandlingapi.h>
# include <fileapi.h>
# include <windows.h>
# include "windows-error.hh"
namespace nix {
@ -154,3 +156,4 @@ FdLock::FdLock(Descriptor desc, LockType lockType, bool wait, std::string_view w
}
}
#endif

View file

@ -1,6 +1,7 @@
#include "environment-variables.hh"
#include "processenv.h"
#ifdef WIN32
# include "processenv.h"
namespace nix {
@ -43,3 +44,4 @@ int setEnvOs(const OsString & name, const OsString & value)
}
}
#endif

View file

@ -5,6 +5,7 @@
#include "windows-error.hh"
#include "file-path.hh"
#ifdef WIN32
#include <fileapi.h>
#include <error.h>
#include <namedpipeapi.h>
@ -152,3 +153,4 @@ Path windows::handleToPath(HANDLE handle) {
#endif
}
#endif

View file

@ -1,5 +1,6 @@
#include "file-system.hh"
#ifdef WIN32
namespace nix {
Descriptor openDirectory(const std::filesystem::path & path)
@ -15,3 +16,4 @@ Descriptor openDirectory(const std::filesystem::path & path)
}
}
#endif

View file

@ -1,9 +1,10 @@
#include <ioapiset.h>
#include "windows-error.hh"
#ifdef WIN32
# include <ioapiset.h>
# include "windows-error.hh"
#include "logging.hh"
#include "util.hh"
#include "muxable-pipe.hh"
# include "logging.hh"
# include "util.hh"
# include "muxable-pipe.hh"
namespace nix {
@ -68,3 +69,4 @@ void MuxablePipePollState::iterate(
}
}
#endif

View file

@ -7,6 +7,8 @@
#include "file-path-impl.hh"
#include "util.hh"
#ifdef WIN32
namespace nix {
std::string os_string_to_string(PathViewNG::string_view path)
@ -22,3 +24,5 @@ std::filesystem::path::string_type string_to_os_string(std::string_view s)
}
}
#endif

View file

@ -23,6 +23,8 @@
#include <sys/types.h>
#include <unistd.h>
#ifdef WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
@ -386,3 +388,5 @@ int execvpe(const wchar_t * file0, const wchar_t * const argv[], const wchar_t *
}
}
#endif

View file

@ -4,6 +4,7 @@
#include "file-system.hh"
#include "windows-error.hh"
#ifdef WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
@ -50,3 +51,4 @@ bool isRootUser() {
}
}
#endif

View file

@ -1,6 +1,8 @@
#include "windows-async-pipe.hh"
#include "windows-error.hh"
#ifdef WIN32
namespace nix::windows {
void AsyncPipe::createAsyncPipe(HANDLE iocp)
@ -47,3 +49,5 @@ void AsyncPipe::close()
}
}
#endif

View file

@ -2,6 +2,7 @@
///@file
#include "file-descriptor.hh"
#ifdef WIN32
namespace nix::windows {
@ -25,3 +26,4 @@ public:
};
}
#endif

View file

@ -1,5 +1,6 @@
#include "windows-error.hh"
#ifdef WIN32
#include <error.h>
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
@ -29,3 +30,4 @@ std::string WinError::renderError(DWORD lastError)
}
}
#endif

View file

@ -1,6 +1,7 @@
#pragma once
///@file
#ifdef WIN32
#include <errhandlingapi.h>
#include "error.hh"
@ -49,3 +50,4 @@ private:
};
}
#endif