[PATCH] HP-UX traditionally has no sys/select.h

[PATCH] HP-UX traditionally has no sys/select.h

[Robert Schiele]

The select stuff is already in sys/time.h on traditional HP-UX
systems thus we should not include sys/select.h there because older
releases don't have it.
---
 git-compat-util.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/git-compat-util.h b/git-compat-util.h
index b6ef544..77de915 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -68,7 +68,9 @@
 #include <sys/poll.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
+#ifndef __hpux
 #include <sys/select.h>
+#endif
 #include <assert.h>
 #include <regex.h>
 #include <netinet/in.h>
-- 
1.5.2.4

Re: [PATCH] HP-UX traditionally has no sys/select.h

[Johannes Schindelin]

Hi,

On Thu, 24 Jan 2008, Robert Schiele wrote:

> The select stuff is already in sys/time.h on traditional HP-UX
> systems thus we should not include sys/select.h there because older
> releases don't have it.

Thank you for your patch.

> diff --git a/git-compat-util.h b/git-compat-util.h
> index b6ef544..77de915 100644
> --- a/git-compat-util.h
> +++ b/git-compat-util.h
> @@ -68,7 +68,9 @@
>  #include <sys/poll.h>
>  #include <sys/socket.h>
>  #include <sys/ioctl.h>
> +#ifndef __hpux
>  #include <sys/select.h>
> +#endif
>  #include <assert.h>
>  #include <regex.h>
>  #include <netinet/in.h>

We try to avoid using constructs like this.  Rather, we have a section in 
the Makefile which sets things like NO_IPV6=YesPlease, 
OLD_ICONV=UnfortunatelyYes, etc.

Later in the Makefile, dependent on this Makefile variable, symbols 
are defined. In the source code, we check for these symbols.

It is not only a matter of being able to reuse the same symbol for another 
platform/setup, it is also a nice way of documentation.

In your case, I suggest NO_SYS_SELECT_H=UnfortunatelyYes.

Thanks,
Dscho

Re: [PATCH] HP-UX traditionally has no sys/select.h

[Robert Schiele]

[-- Attachment #1: Type: text/plain, Size: 822 bytes --]

On Thu, Jan 24, 2008 at 06:03:14PM +0000, Johannes Schindelin wrote:
> We try to avoid using constructs like this.  Rather, we have a section in 
> the Makefile which sets things like NO_IPV6=YesPlease, 
> OLD_ICONV=UnfortunatelyYes, etc.
> 
> Later in the Makefile, dependent on this Makefile variable, symbols 
> are defined. In the source code, we check for these symbols.
> 
> It is not only a matter of being able to reuse the same symbol for another 
> platform/setup, it is also a nice way of documentation.
> 
> In your case, I suggest NO_SYS_SELECT_H=UnfortunatelyYes.

Ok, implemented it that way now and also made HP-UX support in Makefile in a
separate patch.

Robert

-- 
Robert Schiele
Dipl.-Wirtsch.informatiker	mailto:rschiele@gmail.com

"Quidquid latine dictum sit, altum sonatur."

[-- Attachment #2: Type: application/pgp-signature, Size: 194 bytes --]

Re: [PATCH] HP-UX traditionally has no sys/select.h

[Junio C Hamano]

Robert Schiele <rschiele@gmail.com> writes:

> The select stuff is already in sys/time.h on traditional HP-UX
> systems thus we should not include sys/select.h there because older
> releases don't have it.
> ---
>  git-compat-util.h |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/git-compat-util.h b/git-compat-util.h
> index b6ef544..77de915 100644
> --- a/git-compat-util.h
> +++ b/git-compat-util.h
> @@ -68,7 +68,9 @@
>  #include <sys/poll.h>
>  #include <sys/socket.h>
>  #include <sys/ioctl.h>
> +#ifndef __hpux
>  #include <sys/select.h>
> +#endif
>  #include <assert.h>
>  #include <regex.h>
>  #include <netinet/in.h>
> -- 
> 1.5.2.4

We had a thread on this issue mid December.
Does this help?

>From 72a41cae180ad57c6f2daa0af9b96e284386dc1b Mon Sep 17 00:00:00 2001
From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 18 Dec 2007 01:52:07 -0800
Subject: [PATCH] Do not include <sys/select.h> on pre- POSIX.1-2001 systems

For previous version of SUS, select(2) would have been declared in
<sys/time.h>, which is already included.  POSIX.1-2001 moved the
declaration to <sys/select.h>, so check _POSIX_VERSION with 200112L
and skip inclusion of <sys/select.h> if it is not the case.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 git-compat-util.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/git-compat-util.h b/git-compat-util.h
index b6ef544..fb3b969 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -68,7 +68,9 @@
 #include <sys/poll.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
+#if _POSIX_VERSION >= 200112L
 #include <sys/select.h>
+#endif
 #include <assert.h>
 #include <regex.h>
 #include <netinet/in.h>
-- 
1.5.4.rc4.23.gcab31

Re: [PATCH] HP-UX traditionally has no sys/select.h

[Robert Schiele]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

On Thu, Jan 24, 2008 at 11:11:44AM -0800, Junio C Hamano wrote:
> We had a thread on this issue mid December.
> Does this help?

Yes, checking for the _POSIX_VERSION is also a working approach.

Robert

-- 
Robert Schiele
Dipl.-Wirtsch.informatiker	mailto:rschiele@gmail.com

"Quidquid latine dictum sit, altum sonatur."

[-- Attachment #2: Type: application/pgp-signature, Size: 194 bytes --]