| Message ID | 20240503091427.2808390-1-mh@glandium.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 395c130fd80f22e213d6dd56c2b14fa653d5ffda |
| Headers | show |
| Series | Win32: Fix building with NO_UNIX_SOCKETS | expand |
Hi Mike, On Fri, 3 May 2024, Mike Hommey wrote: > After 2406bf5fc5 it fails with: > > compat/mingw.c:4160:5: error: no previous prototype for function 'mingw_have_unix_sockets' [-Werror,-Wmissing-prototypes] > 4160 | int mingw_have_unix_sockets(void) > | ^ > > because the prototype is behind `ifndef NO_UNIX_SOCKETS` Good catch! Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Thank you, Johannes > > Signed-off-by: Mike Hommey <mh@glandium.org> > --- > compat/mingw.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/compat/mingw.c b/compat/mingw.c > index 4876344b5b..6b06ea540f 100644 > --- a/compat/mingw.c > +++ b/compat/mingw.c > @@ -3159,6 +3159,7 @@ int uname(struct utsname *buf) > return 0; > } > > +#ifndef NO_UNIX_SOCKETS > int mingw_have_unix_sockets(void) > { > SC_HANDLE scm, srvc; > @@ -3177,3 +3178,4 @@ int mingw_have_unix_sockets(void) > } > return ret; > } > +#endif > -- > 2.45.0.1.ge6f3e402ce > >
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes: > Hi Mike, > > On Fri, 3 May 2024, Mike Hommey wrote: > >> After 2406bf5fc5 it fails with: >> >> compat/mingw.c:4160:5: error: no previous prototype for function 'mingw_have_unix_sockets' [-Werror,-Wmissing-prototypes] >> 4160 | int mingw_have_unix_sockets(void) >> | ^ >> >> because the prototype is behind `ifndef NO_UNIX_SOCKETS` > > Good catch! > > Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> > > Thank you, > Johannes Thanks, both. Will queue. > >> >> Signed-off-by: Mike Hommey <mh@glandium.org> >> --- >> compat/mingw.c | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/compat/mingw.c b/compat/mingw.c >> index 4876344b5b..6b06ea540f 100644 >> --- a/compat/mingw.c >> +++ b/compat/mingw.c >> @@ -3159,6 +3159,7 @@ int uname(struct utsname *buf) >> return 0; >> } >> >> +#ifndef NO_UNIX_SOCKETS >> int mingw_have_unix_sockets(void) >> { >> SC_HANDLE scm, srvc; >> @@ -3177,3 +3178,4 @@ int mingw_have_unix_sockets(void) >> } >> return ret; >> } >> +#endif >> -- >> 2.45.0.1.ge6f3e402ce >> >>
diff --git a/compat/mingw.c b/compat/mingw.c index 4876344b5b..6b06ea540f 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -3159,6 +3159,7 @@ int uname(struct utsname *buf) return 0; } +#ifndef NO_UNIX_SOCKETS int mingw_have_unix_sockets(void) { SC_HANDLE scm, srvc; @@ -3177,3 +3178,4 @@ int mingw_have_unix_sockets(void) } return ret; } +#endif
After 2406bf5fc5 it fails with: compat/mingw.c:4160:5: error: no previous prototype for function 'mingw_have_unix_sockets' [-Werror,-Wmissing-prototypes] 4160 | int mingw_have_unix_sockets(void) | ^ because the prototype is behind `ifndef NO_UNIX_SOCKETS` Signed-off-by: Mike Hommey <mh@glandium.org> --- compat/mingw.c | 2 ++ 1 file changed, 2 insertions(+)