From 278f28ccc77139214b40d988ed81ce25f7223d1e Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Wed, 1 Dec 2021 21:33:12 +0100
Subject: [PATCH] MISC: Write some things in a simpler way
---
inc/lektor/internal/os.h | 1 +
inc/lektor/internal/worker.h | 9 +--------
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/inc/lektor/internal/os.h b/inc/lektor/internal/os.h
index 80bd2640..bdea7fb9 100644
--- a/inc/lektor/internal/os.h
+++ b/inc/lektor/internal/os.h
@@ -97,6 +97,7 @@ typedef int SOCKET;
#define fdopen _fdopen
#define mkdir(str, perm) _mkdir(str)
#define socket(dom, type, proto__) WSASocket(dom, type, 0, 0, 0, 0)
+#define get_nprocs_conf() 2
#endif
diff --git a/inc/lektor/internal/worker.h b/inc/lektor/internal/worker.h
index c781b582..b5d17100 100644
--- a/inc/lektor/internal/worker.h
+++ b/inc/lektor/internal/worker.h
@@ -80,11 +80,8 @@ worker_pool_thread(void *___pool)
--(pool->thread_working);
assert(!pthread_mutex_unlock((pthread_mutex_t *)&pool->lock));
}
- #if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
- pthread_exit(NULL);
- #else
+
return NULL;
- #endif
}
PRIVATE_FUNCTION WORKER_STATUS
@@ -124,11 +121,7 @@ PRIVATE_FUNCTION int
worker_pool_new(struct worker_pool *ret, size_t init_size, size_t thread_count)
{
if (!thread_count) {
- #if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
const int nprocs = get_nprocs_conf();
- #else
- const int nprocs = 2;
- #endif
assert(nprocs > 0);
thread_count = (size_t)nprocs;
}
--
GitLab