Skip to content

Commit 7b67b20

Browse files
committed
Fix Windows MODE=tiny breakage
1 parent f0b0f92 commit 7b67b20

File tree

1 file changed

+4
-14
lines changed

1 file changed

+4
-14
lines changed

libc/intrin/fds.c

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,11 @@
4646
#include "libc/thread/thread.h"
4747
#include "libc/thread/tls.h"
4848

49-
#define OPEN_MAX 16
50-
5149
#ifdef __x86_64__
5250
__static_yoink("_init_fds");
5351
#endif
5452

5553
struct Fds g_fds;
56-
static struct Fd g_fds_static[OPEN_MAX];
5754

5855
static bool TokAtoi(const char **str, long *res) {
5956
int c, d;
@@ -92,15 +89,9 @@ textstartup void __init_fds(int argc, char **argv, char **envp) {
9289
fds = &g_fds;
9390
fds->n = 4;
9491
atomic_store_explicit(&fds->f, 3, memory_order_relaxed);
95-
if (_weaken(_extend)) {
96-
fds->p = fds->e = (void *)kMemtrackFdsStart;
97-
fds->e =
98-
_weaken(_extend)(fds->p, fds->n * sizeof(*fds->p), fds->e, MAP_PRIVATE,
99-
kMemtrackFdsStart + kMemtrackFdsSize);
100-
} else {
101-
fds->p = g_fds_static;
102-
fds->e = g_fds_static + OPEN_MAX;
103-
}
92+
fds->p = fds->e = (void *)kMemtrackFdsStart;
93+
fds->e = _extend(fds->p, fds->n * sizeof(*fds->p), fds->e, MAP_PRIVATE,
94+
kMemtrackFdsStart + kMemtrackFdsSize);
10495

10596
// inherit standard i/o file descriptors
10697
if (IsMetal()) {
@@ -154,8 +145,7 @@ textstartup void __init_fds(int argc, char **argv, char **envp) {
154145
break;
155146
if (!TokAtoi(&fdspec, &protocol))
156147
break;
157-
if (_weaken(__ensurefds_unlocked))
158-
_weaken(__ensurefds_unlocked)(fd);
148+
__ensurefds_unlocked(fd);
159149
struct Fd *f = fds->p + fd;
160150
if (f->handle && f->handle != -1 && f->handle != handle) {
161151
CloseHandle(f->handle);

0 commit comments

Comments
 (0)