Commit9d73adf

and

authored

gh-84461: Silence some compiler warnings on WASM (GH-93978) (#94025)

(cherry picked from commit774ef28)Co-authored-by: Christian Heimes <christian@python.org>

1 parent8a1bade commit9d73adfCopy full SHA for 9d73adf

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ _enter_buffered_busy(buffered *self)`
`341`	`341`	`: buffered_closed(self)))`
`342`	`342`
`343`	`343`	`#defineCHECK_CLOSED(self,error_msg) \`
`344`		`- if (IS_CLOSED(self) & (Py_SAFE_DOWNCAST(READAHEAD(self), Py_off_t, Py_ssize_t) == 0)) { \`
	`344`	`+ if (IS_CLOSED(self) && (Py_SAFE_DOWNCAST(READAHEAD(self), Py_off_t, Py_ssize_t) == 0)) { \`
`345`	`345`	`PyErr_SetString(PyExc_ValueError, error_msg); \`
`346`	`346`	`return NULL; \`
`347`	`347`	`} \`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -104,8 +104,8 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)`
`104`	`104`	`u_longv4a;`
`105`	`105`	`#ifdefENABLE_IPV6`
`106`	`106`	`u_charpfx;`
`107`		`-#endif`
`108`	`107`	`inth_error;`
	`108`	`+#endif`
`109`	`109`	`charnumserv[512];`
`110`	`110`	`charnumaddr[512];`
`111`	`111`
`@@ -181,7 +181,6 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)`
`181`	`181`	`hp=getipnodebyaddr(addr,gni_afd->a_addrlen,gni_afd->a_af,&h_error);`
`182`	`182`	`#else`
`183`	`183`	`hp=gethostbyaddr(addr,gni_afd->a_addrlen,gni_afd->a_af);`
`184`		`-h_error=h_errno;`
`185`	`184`	`#endif`
`186`	`185`
`187`	`186`	`if (hp) {`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -185,8 +185,8 @@ compare_handler(PyObject func, PyObject dfl_ign_handler)`
`185`	`185`	`returnPyObject_RichCompareBool(func,dfl_ign_handler,Py_EQ)==1;`
`186`	`186`	`}`
`187`	`187`
`188`		`-#ifdefHAVE_GETITIMER`
`189`		`-/* auxiliaryfunctions for setitimer */`
	`188`	`+#ifdefHAVE_SETITIMER`
	`189`	`+/* auxiliaryfunction for setitimer */`
`190`	`190`	`staticint`
`191`	`191`	`timeval_from_double(PyObjectobj,structtimevaltv)`
`192`	`192`	`{`
`@@ -202,7 +202,10 @@ timeval_from_double(PyObject obj, struct timeval tv)`
`202`	`202`	`}`
`203`	`203`	`return_PyTime_AsTimeval(t,tv,_PyTime_ROUND_CEILING);`
`204`	`204`	`}`
	`205`	`+#endif`
`205`	`206`
	`207`	`+#if defined(HAVE_SETITIMER)\|\| defined(HAVE_GETITIMER)`
	`208`	`+/* auxiliary functions for get/setitimer */`
`206`	`209`	`Py_LOCAL_INLINE(double)`
`207`	`210`	`double_from_timeval(structtimeval*tv)`
`208`	`211`	`{`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -996,6 +996,7 @@ init_sockobject(PySocketSockObject *s,`
`996`	`996`	`}`
`997`	`997`
`998`	`998`
	`999`	`+#ifdefHAVE_SOCKETPAIR`
`999`	`1000`	`/* Create a new socket object.`
`1000`	`1001`	`This just creates the object and initializes it.`
`1001`	`1002`	`If the creation fails, return NULL and set an exception (implicit`
`@@ -1015,6 +1016,7 @@ new_sockobject(SOCKET_T fd, int family, int type, int proto)`
`1015`	`1016`	`}`
`1016`	`1017`	`returns;`
`1017`	`1018`	`}`
	`1019`	`+#endif`
`1018`	`1020`
`1019`	`1021`
`1020`	`1022`	`/* Lock to allow python interpreter to continue, but only allow one`

Comments

(0)