[PATCH ew/daemon-socket-keepalive] Windows: add missing definition of ENOTSOCK

[PATCH ew/daemon-socket-keepalive] Windows: add missing definition of ENOTSOCK

[Johannes Sixt]

The previous commit introduced the first use of ENOTSOCK. This macro is
not available on Windows. Define it as WSAENOTSOCK because that is the
corresponding error value reported by the Windows versions of socket
functions.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---
  compat/mingw.h | 3 +++
  1 file changed, 3 insertions(+)

diff --git a/compat/mingw.h b/compat/mingw.h
index 233933e..95e128f 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -73,6 +73,9 @@ typedef int pid_t;
  #ifndef ECONNABORTED
  #define ECONNABORTED WSAECONNABORTED
  #endif
+#ifndef ENOTSOCK
+#define ENOTSOCK WSAENOTSOCK
+#endif

  struct passwd {
  	char *pw_name;
-- 
2.9.0.443.ga8520ad

Re: [PATCH ew/daemon-socket-keepalive] Windows: add missing definition of ENOTSOCK

[Johannes Schindelin]

Hi Hannes,

On Thu, 21 Jul 2016, Johannes Sixt wrote:

> The previous commit introduced the first use of ENOTSOCK. This macro is
> not available on Windows. Define it as WSAENOTSOCK because that is the
> corresponding error value reported by the Windows versions of socket
> functions.

Thanks for catching this early.

Ciao,
Dscho

Re: [PATCH ew/daemon-socket-keepalive] Windows: add missing definition of ENOTSOCK

[Junio C Hamano]

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> Hi Hannes,
>
> On Thu, 21 Jul 2016, Johannes Sixt wrote:
>
>> The previous commit introduced the first use of ENOTSOCK. This macro is
>> not available on Windows. Define it as WSAENOTSOCK because that is the
>> corresponding error value reported by the Windows versions of socket
>> functions.
>
> Thanks for catching this early.

(is that an acked/reviewed-by?  it is OK if it is not).

Yeah, thanks, both.

Re: [PATCH ew/daemon-socket-keepalive] Windows: add missing definition of ENOTSOCK

[Eric Wong]

Johannes Sixt <j6t@kdbg.org> wrote:
> The previous commit introduced the first use of ENOTSOCK. This macro is
> not available on Windows. Define it as WSAENOTSOCK because that is the
> corresponding error value reported by the Windows versions of socket
> functions.

Thanks.   I thought compat/poll/poll.c already used ENOTSOCK
but I was mislead by the #ifdefs :x

Re: [PATCH ew/daemon-socket-keepalive] Windows: add missing definition of ENOTSOCK

[Johannes Schindelin]

Hi Junio,

On Fri, 22 Jul 2016, Junio C Hamano wrote:

> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> 
> > On Thu, 21 Jul 2016, Johannes Sixt wrote:
> >
> >> The previous commit introduced the first use of ENOTSOCK. This macro is
> >> not available on Windows. Define it as WSAENOTSOCK because that is the
> >> corresponding error value reported by the Windows versions of socket
> >> functions.
> >
> > Thanks for catching this early.
> 
> (is that an acked/reviewed-by?  it is OK if it is not).

It had been neither, as I had only looked at the patch briefly (which I
deem not enough to account for a review).

However, I now reviewed it properly and offer my Acked-by:.

If it is not too much to ask, I would love to have the following added to
the commit message:

	For details, see
	https://msdn.microsoft.com/en-us/library/windows/desktop/ms740476.aspx

Thanks,
Dscho

[PATCH v2 ew/daemon-socket-keepalive] Windows: add missing definition of ENOTSOCK

[Johannes Sixt]

The previous commit introduced the first use of ENOTSOCK. This macro is
not available on Windows. Define it as WSAENOTSOCK because that is the
corresponding error value reported by the Windows versions of socket
functions.

For details, see
https://msdn.microsoft.com/en-us/library/windows/desktop/ms740476.aspx

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
---
 Same patch text, but the commit message is amended, just in case it's
 easier for you to apply a new patch than to amend a queued one.

 Thanks everybody.

 compat/mingw.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/compat/mingw.h b/compat/mingw.h
index 233933e..95e128f 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -73,6 +73,9 @@ typedef int pid_t;
 #ifndef ECONNABORTED
 #define ECONNABORTED WSAECONNABORTED
 #endif
+#ifndef ENOTSOCK
+#define ENOTSOCK WSAENOTSOCK
+#endif

 struct passwd {
     char *pw_name;
-- 
2.9.0.443.ga8520ad