Merge pull request #5578 from martin-frbg/mingw-getenv

martin-frbg · web-flow · commit 097d2d98fd4f · 2025-12-23T18:56:53.000+01:00
Fix potential crash on startup in CYGWIN or MINGW builds with DYNAMIC_ARCH
diff --git a/common.h b/common.h
@@ -765,7 +765,7 @@ static __inline int readenv_atoi(char *env) {
 	return 0;
 }
 #else
-#ifdef OS_WINDOWS
+#if defined(OS_WINDOWS) && !defined(OS_CYGWIN_NT)
 static __inline int readenv_atoi(char *env) {
   env_var_t p;
   return readenv(p,env) ? 0 : atoi(p);

Original file line number	Diff line number	Diff line change
`@@ -765,7 +765,7 @@ static __inline int readenv_atoi(char *env) {`
`765`	`765`	`return 0;`
`766`	`766`	`}`
`767`	`767`	`#else`
`768`		`-#ifdef OS_WINDOWS`
	`768`	`+#if defined(OS_WINDOWS) && !defined(OS_CYGWIN_NT)`
`769`	`769`	`static __inline int readenv_atoi(char *env) {`
`770`	`770`	`env_var_t p;`
`771`	`771`	`return readenv(p,env) ? 0 : atoi(p);`