# [PATCH] compat: fixes for header handling with OpenBSD / NetBSD 6 messages from 2025-06-02 to 2025-06-03. Participants: Brad Smith, Collin Funk, Junio C Hamano. Thread: https://gitlist.dev/t/63559 ## Brad Smith, 2025-06-02 07:29 Subject: [PATCH] compat: fixes for header handling with OpenBSD / NetBSD Message-ID: URL: https://gitlist.dev/e/aD1SvlRypkhczxRS%40humpty.home.comstyle.com ``` Handle OpenBSD and NetBSD as FreeBSD / DragonFly are. OpenBSD would need _XOPEN_SOURCE to be set to 700. Its simpler to just not set _XOPEN_SOURCE. CC strbuf.o strbuf.c:645:6: warning: call to undeclared function 'getdelim'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] r = getdelim(&sb->buf, &sb->alloc, term, fp); ^ 1 warning generated. Signed-off-by: Brad Smith --- compat/posix.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/compat/posix.h b/compat/posix.h index f4c71f9427..61fb08b64c 100644 --- a/compat/posix.h +++ b/compat/posix.h @@ -60,18 +60,17 @@ # else # define _XOPEN_SOURCE 500 # endif -#elif !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__USLC__) && \ - !defined(_M_UNIX) && !defined(__sgi) && !defined(__DragonFly__) && \ - !defined(__TANDEM) && !defined(__QNX__) && !defined(__MirBSD__) && \ - !defined(__CYGWIN__) -#define _XOPEN_SOURCE 600 /* glibc2 and AIX 5.3L need 500, OpenBSD needs 600 for S_ISLNK() */ +#elif !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && \ + !defined(__OpenBSD__) && !defined(__DragonFly__) && !defined(__MirBSD__) && \ + !defined(__USLC__) && !defined(_M_UNIX) && !defined(__sgi) && \ + !defined(__TANDEM) && !defined(__QNX__) && !defined(__CYGWIN__) +#define _XOPEN_SOURCE 600 /* glibc2 and AIX 5.3L need 500 */ #define _XOPEN_SOURCE_EXTENDED 1 /* AIX 5.3L needs this */ #endif #define _ALL_SOURCE 1 #define _GNU_SOURCE 1 #define _BSD_SOURCE 1 #define _DEFAULT_SOURCE 1 -#define _NETBSD_SOURCE 1 #define _SGI_SOURCE 1 #if defined(WIN32) && !defined(__CYGWIN__) /* Both MinGW and MSVC */ -- 2.49.0 ``` ## Collin Funk, 2025-06-02 18:06 Subject: Re: [PATCH] compat: fixes for header handling with OpenBSD / NetBSD Message-ID: <87wm9ut3uo.fsf@gmail.com> URL: https://gitlist.dev/e/87wm9ut3uo.fsf%40gmail.com In-Reply-To: ``` Hi Brad, You wrote: > Handle OpenBSD and NetBSD as FreeBSD / DragonFly are. OpenBSD would > need _XOPEN_SOURCE to be set to 700. Its simpler to just not set > _XOPEN_SOURCE. > > CC strbuf.o > strbuf.c:645:6: warning: call to undeclared function 'getdelim'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] > r = getdelim(&sb->buf, &sb->alloc, term, fp); > ^ > 1 warning generated. > > Signed-off-by: Brad Smith > --- > compat/posix.h | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) I noticed this as well when testing your other fixes. Just one question about this chunk: > #define _DEFAULT_SOURCE 1 > -#define _NETBSD_SOURCE 1 Why remove this definition? I think it might be useful on some older systems and seems harmless otherwise. Other than that, I tested on OpenBSD 7.6 and NetBSD 10.0 and this patch fixes the missing declarations. So: Reviewed-by: Collin Funk Collin ``` ## Junio C Hamano, 2025-06-03 00:36 Subject: Re: [PATCH] compat: fixes for header handling with OpenBSD / NetBSD Message-ID: URL: https://gitlist.dev/e/xmqqfrghslu0.fsf%40gitster.g In-Reply-To: <87wm9ut3uo.fsf@gmail.com> ``` Collin Funk writes: > Just one question about this chunk: > >> #define _DEFAULT_SOURCE 1 >> -#define _NETBSD_SOURCE 1 > > Why remove this definition? I think it might be useful on some older > systems and seems harmless otherwise. Yes, it is curious. > > Other than that, I tested on OpenBSD 7.6 and NetBSD 10.0 and this patch > fixes the missing declarations. So: > > Reviewed-by: Collin Funk > > Collin ``` ## Brad Smith, 2025-06-03 03:56 Subject: Re: [PATCH] compat: fixes for header handling with OpenBSD / NetBSD Message-ID: <47c58a78-d38b-4170-87fc-c9332618d0da@comstyle.com> URL: https://gitlist.dev/e/47c58a78-d38b-4170-87fc-c9332618d0da%40comstyle.com In-Reply-To: <87wm9ut3uo.fsf@gmail.com> ``` On 2025-06-02 2:06 p.m., Collin Funk wrote: > Hi Brad, > > You wrote: > >> Handle OpenBSD and NetBSD as FreeBSD / DragonFly are. OpenBSD would >> need _XOPEN_SOURCE to be set to 700. Its simpler to just not set >> _XOPEN_SOURCE. >> >> CC strbuf.o >> strbuf.c:645:6: warning: call to undeclared function 'getdelim'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] >> r = getdelim(&sb->buf, &sb->alloc, term, fp); >> ^ >> 1 warning generated. >> >> Signed-off-by: Brad Smith >> --- >> compat/posix.h | 11 +++++------ >> 1 file changed, 5 insertions(+), 6 deletions(-) > I noticed this as well when testing your other fixes. > > Just one question about this chunk: > >> #define _DEFAULT_SOURCE 1 >> -#define _NETBSD_SOURCE 1 > Why remove this definition? I think it might be useful on some older > systems and seems harmless otherwise. _XOPEN_SOURCE restricts the build environment. _NETBSD_SOURCE is added to counteract _XOPEN_SOURCE. Not setting it in the first place provides everything by default. I was removing it as it should no longer be necessary. But as said, it is harmless. I can leave it in if desired. > Other than that, I tested on OpenBSD 7.6 and NetBSD 10.0 and this patch > fixes the missing declarations. So: > > Reviewed-by: Collin Funk > > Collin > ``` ## Collin Funk, 2025-06-03 04:05 Subject: Re: [PATCH] compat: fixes for header handling with OpenBSD / NetBSD Message-ID: <87y0u9qxk8.fsf@gmail.com> URL: https://gitlist.dev/e/87y0u9qxk8.fsf%40gmail.com In-Reply-To: <47c58a78-d38b-4170-87fc-c9332618d0da@comstyle.com> ``` Brad Smith writes: >> Why remove this definition? I think it might be useful on some older >> systems and seems harmless otherwise. > > _XOPEN_SOURCE restricts the build environment. _NETBSD_SOURCE is added > to counteract > _XOPEN_SOURCE. Not setting it in the first place provides everything > by default. > > I was removing it as it should no longer be necessary. > > But as said, it is harmless. I can leave it in if desired. In Autoconf's AC_USE_SYSTEM_EXTENSIONS it is defined with the comment: /* Enable general extensions on NetBSD. Enable NetBSD compatibility extensions on Minix. */ I would prefer just leaving it for any old system that may need it. Or in case git uses features from a recent standard that might still be hidden as a NetBSD extension. For example, POSIX.1-2024 has been released, but most functions added there are still under _GNU_SOURCE in current glibc. Collin ``` ## Junio C Hamano, 2025-06-03 14:37 Subject: Re: [PATCH] compat: fixes for header handling with OpenBSD / NetBSD Message-ID: URL: https://gitlist.dev/e/xmqqwm9sriv3.fsf%40gitster.g In-Reply-To: <87y0u9qxk8.fsf@gmail.com> ``` Collin Funk writes: > Brad Smith writes: > ... >> But as said, it is harmless. I can leave it in if desired. > ... > I would prefer just leaving it for any old system that may need it. OK, here is what I will queue. -------- >8 -------- From: Brad Smith Date: Mon, 2 Jun 2025 03:29:02 -0400 Subject: [PATCH] compat: fixes for header handling with OpenBSD / NetBSD Handle OpenBSD and NetBSD as FreeBSD / DragonFly are. OpenBSD would need _XOPEN_SOURCE to be set to 700. Its simpler to just not set _XOPEN_SOURCE. CC strbuf.o strbuf.c:645:6: warning: call to undeclared function 'getdelim'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] r = getdelim(&sb->buf, &sb->alloc, term, fp); ^ 1 warning generated. Signed-off-by: Brad Smith Reviewed-by: Collin Funk Signed-off-by: Junio C Hamano --- compat/posix.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/compat/posix.h b/compat/posix.h index f4c71f9427..067a00f33b 100644 --- a/compat/posix.h +++ b/compat/posix.h @@ -60,11 +60,11 @@ # else # define _XOPEN_SOURCE 500 # endif -#elif !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__USLC__) && \ - !defined(_M_UNIX) && !defined(__sgi) && !defined(__DragonFly__) && \ - !defined(__TANDEM) && !defined(__QNX__) && !defined(__MirBSD__) && \ - !defined(__CYGWIN__) -#define _XOPEN_SOURCE 600 /* glibc2 and AIX 5.3L need 500, OpenBSD needs 600 for S_ISLNK() */ +#elif !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && \ + !defined(__OpenBSD__) && !defined(__DragonFly__) && !defined(__MirBSD__) && \ + !defined(__USLC__) && !defined(_M_UNIX) && !defined(__sgi) && \ + !defined(__TANDEM) && !defined(__QNX__) && !defined(__CYGWIN__) +#define _XOPEN_SOURCE 600 /* glibc2 and AIX 5.3L need 500 */ #define _XOPEN_SOURCE_EXTENDED 1 /* AIX 5.3L needs this */ #endif #define _ALL_SOURCE 1 -- 2.50.0-rc0-176-g427db30fd9 ```