Commitc57960c

authored and

committed

Backport PR#28682: Fix warnings from mingw compilers

1 parent2811043 commitc57960cCopy full SHA for c57960c

File tree

+18

-4

lines changed

+18

-4

lines changed

Lines changed: 10 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,14 @@`
`7`	`7`	`#defineWIN32_LEAN_AND_MEAN`
`8`	`8`	`// Windows 10, for latest HiDPI API support.`
`9`	`9`	`#defineWINVER0x0A00`
`10`		`-#define_WIN32_WINNT0x0A00`
	`10`	`+#if defined(_WIN32_WINNT)`
	`11`	`+#if _WIN32_WINNT < WINVER`
	`12`	`+#undef _WIN32_WINNT`
	`13`	`+#define_WIN32_WINNT WINVER`
	`14`	`+#endif`
	`15`	`+#else`
	`16`	`+#define_WIN32_WINNT WINVER`
	`17`	`+#endif`
`11`	`18`	`#endif`
`12`	`19`	`#include<pybind11/pybind11.h>`
`13`	`20`	`#ifdef __linux__`
`@@ -125,7 +132,7 @@ static void`
`125`	`132`	`mpl_SetForegroundWindow(py::capsuleUNUSED_ON_NON_WINDOWS(handle_p))`
`126`	`133`	`{`
`127`	`134`	`#ifdef _WIN32`
`128`		`-if (handle_p.name() !="HWND") {`
	`135`	`+if (strcmp(handle_p.name(),"HWND") !=0) {`
`129`	`136`	`throwstd::runtime_error("Handle must be a value returned from Win32_GetForegroundWindow");`
`130`	`137`	`}`
`131`	`138`	`HWND handle =static_cast<HWND>(handle_p.get_pointer());`
`@@ -158,7 +165,7 @@ mpl_SetProcessDpiAwareness_max(void)`
`158`	`165`	`DPI_AWARENESS_CONTEXT_SYSTEM_AWARE};// Win10`
`159`	`166`	`if (IsValidDpiAwarenessContextPtr !=NULL`
`160`	`167`	`&& SetProcessDpiAwarenessContextPtr !=NULL) {`
`161`		`-for (int i =0; i <sizeof(ctxs) /sizeof(DPI_AWARENESS_CONTEXT); ++i) {`
	`168`	`+for (size_t i =0; i <sizeof(ctxs) /sizeof(DPI_AWARENESS_CONTEXT); ++i) {`
`162`	`169`	`if (IsValidDpiAwarenessContextPtr(ctxs[i])) {`
`163`	`170`	`SetProcessDpiAwarenessContextPtr(ctxs[i]);`
`164`	`171`	`break;`

Lines changed: 8 additions & 1 deletion

Comments

(0)