Fix pyhash_runtime_state on Windows.

Author: ericsnowcurrently

Include/internal/pycore_pyhash.h

@@ -7,17 +7,32 @@
 
 
 struct pyhash_runtime_state {
-    // This is a placeholder so the struct isn't empty on Windows.
-    int _not_used;
-#ifndef MS_WINDOWS
     struct {
+#ifndef MS_WINDOWS
         int fd;
         dev_t st_dev;
         ino_t st_ino;
-    } urandom_cache;
+#else
+    // This is a placeholder so the struct isn't empty on Windows.
+    int _not_used;
 #endif
+    } urandom_cache;
 };
 
+#ifndef MS_WINDOWS
+# define _py_urandom_cache_INIT \
+    { \
+        .fd = -1, \
+    }
+#else
+# define _py_urandom_cache_INIT {0}
+#endif
+
+#define pyhash_state_INIT \
+    { \
+        .urandom_cache = _py_urandom_cache_INIT, \
+    }
+
 
 uint64_t _Py_KeyedHash(uint64_t, const char *, Py_ssize_t);
 

Include/internal/pycore_runtime_init.h

@@ -25,11 +25,7 @@ extern "C" {
             _pymem_allocators_obj_arena_INIT, \
         }, \
         .obmalloc = _obmalloc_state_INIT(runtime.obmalloc), \
-        .pyhash_state = { \
-            .urandom_cache = { \
-                .fd = -1, \
-            }, \
-        }, \
+        .pyhash_state = pyhash_state_INIT, \
         .interpreters = { \
             /* This prevents interpreters from getting created \
               until _PyInterpreterState_Enable() is called. */ \