From 2b3c451501e598a0703e70472821336eb4f88eb6 Mon Sep 17 00:00:00 2001
From: Elliu <elliu@hashi.re>
Date: Fri, 3 Dec 2021 20:14:45 -0800
Subject: [PATCH] Fix build on windows
---
src/base/config.c | 4 ++++
src/net/listen.c | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/src/base/config.c b/src/base/config.c
index b8bf452b..cddcdd1c 100644
--- a/src/base/config.c
+++ b/src/base/config.c
@@ -224,7 +224,11 @@ config_detect_file(char *conf, size_t conf_len)
memset(conf, 0, conf_len * sizeof(char));
/* Try the current working dir config file. */
+#if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
if (getcwd(conf, to_size_t(conf_len)-1) != NULL) {
+#else
+ if (getcwd(conf, (int)(conf_len)-1) != NULL) {
+#endif
strncat(conf, "/lektor.ini", conf_len - 1);
LOG_INFO("CONFIG", "Trying %s", conf);
if (!access(conf, R_OK | F_OK))
diff --git a/src/net/listen.c b/src/net/listen.c
index fbe92597..d6a23ea6 100644
--- a/src/net/listen.c
+++ b/src/net/listen.c
@@ -648,7 +648,11 @@ init_listening_socket_net(const char *host, const char *port)
}
PRIVATE_FUNCTION int
+#if defined(LKT_OS_WIN) && (LKT_OS_WIN == 1)
+accept_all(SOCKET listen_fd, struct pollfd *fds, size_t fds_max, ULONG *fds_len)
+#else
accept_all(SOCKET listen_fd, struct pollfd *fds, size_t fds_max, size_t *fds_len)
+#endif
{
SOCKET fd;
struct sockaddr_in peer_addr;
--
GitLab