Merge branch 'jk/tighten-alloc' into maint

diff --git a/compat/win32/pthread.c b/compat/win32/pthread.c
index 010e875ec4dd8d7154a0911661570165ac1ae874..e18f5c6e2e55a4b42f178e3042301cd77a654d80 100644 (file)
--- a/compat/win32/pthread.c
+++ b/compat/win32/pthread.c
@@ -52,7 +52,7 @@ int win32_pthread_join(pthread_t *thread, void **value_ptr)
 
 pthread_t pthread_self(void)
 {
-       pthread_t t = { 0 };
+       pthread_t t = { NULL };
        t.tid = GetCurrentThreadId();
        return t;
 }