From 93b05f306054e793bbc6e1997fdf250f5b3244ea Mon Sep 17 00:00:00 2001 From: snarmph Date: Mon, 24 Aug 2026 14:26:23 +0200 Subject: [PATCH] . --- colla.c | 1 - colla.h | 12 +++--------- colla_win32.c | 1 - 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/colla.c b/colla.c index d931f82..cebb9c6 100644 --- a/colla.c +++ b/colla.c @@ -1116,7 +1116,6 @@ bool glob__match_here(instream_t *g, instream_t *t); bool glob__match_star(instream_t *g, instream_t *t) { char c = istr_get(g); - char n = istr_peek(g); do { if (istr_get(t) == c) { return true; diff --git a/colla.h b/colla.h index 24bdb1f..434e5f7 100644 --- a/colla.h +++ b/colla.h @@ -16,7 +16,7 @@ #else #include #ifndef thread_local - #define thread_local _Thread_local + #define thread_local __declspec(thread) #endif #endif @@ -157,13 +157,6 @@ void colla_cleanup(void); #define GB(n) (((u64)n) << 30) #define TB(n) (((u64)n) << 40) -#if COLLA_WIN -#define force_inline __forceinline -#else -// TODO -#define force_inline inline -#endif - #if COLLA_DEBUG #define colla__assert(file, line, cond, ...) do { if (!(cond)) fatal(file ":" line " ASSERT FAILED: (" COLLA__STRINGIFY(cond) ") " __VA_ARGS__); } while (0) #define colla_assert(...) colla__assert(__FILE__, COLLA__STRINGIFY(__LINE__), __VA_ARGS__) @@ -195,6 +188,8 @@ typedef int16_t i16; typedef int32_t i32; typedef int64_t i64; +typedef u32 b32; + typedef size_t usize; typedef ptrdiff_t isize; @@ -1460,4 +1455,3 @@ str_t pretty_print_get_stringv(arena_t *arena, const char *fmt, va_list args); usize pretty_print_get_length(strview_t view); #endif - diff --git a/colla_win32.c b/colla_win32.c index a346122..5ff01a3 100644 --- a/colla_win32.c +++ b/colla_win32.c @@ -1433,4 +1433,3 @@ void sk_destroy_event(oshandle_t handle) { } #endif -