# [PATCH] Include headers for getrlimit() in sha1_file.c 7 messages from 2011-03-16 to 2011-04-03. Participants: Stefan Sperling, Jonathan Nieder, Arnaud Lacombe, Junio C Hamano. Thread: https://gitlist.dev/t/26746 ## Stefan Sperling, 2011-03-16 10:37 Subject: [PATCH] Include headers for getrlimit() in sha1_file.c Message-ID: <1300271879-2050-1-git-send-email-stsp@stsp.name> URL: https://gitlist.dev/e/1300271879-2050-1-git-send-email-stsp%40stsp.name ``` Fixes compilation error on OpenBSD: sha1_file.c: In function 'open_packed_git_1': sha1_file.c:718: error: storage size of 'lim' isn't known sha1_file.c:721: warning: implicit declaration of function 'getrlimit' sha1_file.c:721: error: 'RLIMIT_NOFILE' undeclared (first use in this function) sha1_file.c:718: warning: unused variable 'lim' Signed-off-by: Stefan Sperling --- sha1_file.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index b4fcca8..f969b10 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -18,6 +18,10 @@ #include "pack-revindex.h" #include "sha1-lookup.h" +#include +#include +#include + #ifndef O_NOATIME #if defined(__linux__) && (defined(__i386__) || defined(__PPC__)) #define O_NOATIME 01000000 -- 1.7.3.5 ``` ## Jonathan Nieder, 2011-03-18 20:23 Subject: Re: [PATCH] Include headers for getrlimit() in sha1_file.c Message-ID: <20110318202351.GA22696@elie> URL: https://gitlist.dev/e/20110318202351.GA22696%40elie In-Reply-To: <1300271879-2050-1-git-send-email-stsp@stsp.name> ``` (+cc: Shawn, Erik) Hi Stefan, Stefan Sperling wrote: > Fixes compilation error on OpenBSD: > sha1_file.c: In function 'open_packed_git_1': > sha1_file.c:718: error: storage size of 'lim' isn't known > sha1_file.c:721: warning: implicit declaration of function 'getrlimit' > sha1_file.c:721: error: 'RLIMIT_NOFILE' undeclared (first use in this function) > sha1_file.c:718: warning: unused variable 'lim' Good catch. > --- a/sha1_file.c > +++ b/sha1_file.c > @@ -18,6 +18,10 @@ > #include "pack-revindex.h" > #include "sha1-lookup.h" > > +#include > +#include > +#include System headers like this tend to go in git-compat-util.h, so portability fixes having to do with compatibility replacements or order of inclusion only need to happen in one place. In this case, afaict sys/resource.h is not available on mingw, meaning the #include would probably go in the "#ifndef __MINGW32__" block. Maybe something like this (untested)? -- 8< -- Subject: compat: add missing #include Starting with commit c793430 (Limit file descriptors used by packs, 2011-02-28), git uses getrlimit to tell how many file descriptors it can use. Unfortunately it does not include the header declaring that function, resulting in compilation errors on OpenBSD: sha1_file.c: In function 'open_packed_git_1': sha1_file.c:718: error: storage size of 'lim' isn't known sha1_file.c:721: warning: implicit declaration of function 'getrlimit' sha1_file.c:721: error: 'RLIMIT_NOFILE' undeclared (first use in this function) sha1_file.c:718: warning: unused variable 'lim' The standard header to include for this is (which on some systems itself requires declarations from or ). Probably the problem was missed until now because in current glibc sys/resource.h happens to be included by sys/wait.h. MinGW does not provide sys/resource.h (and compat/mingw takes care of providing getrlimit some other way), so add the missing #include to the "#ifndef __MINGW32__" block in git-compat-util.h. Reported-by: Stefan Sperling Signed-off-by: Jonathan Nieder --- git-compat-util.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/git-compat-util.h b/git-compat-util.h index 49b50ee..40498b3 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -118,6 +118,7 @@ #endif #ifndef __MINGW32__ #include +#include #include #include #include -- 1.7.4.1 ``` ## Arnaud Lacombe, 2011-03-19 00:22 Subject: Re: [PATCH] Include headers for getrlimit() in sha1_file.c Message-ID: URL: https://gitlist.dev/e/AANLkTi%3DtJL8A9RyuoitSSUAWEF7%2BPZxxWZPcQdk00yj9%40mail.gmail.com In-Reply-To: <20110318202351.GA22696@elie> ``` Hi, On Fri, Mar 18, 2011 at 4:23 PM, Jonathan Nieder wrote: > (+cc: Shawn, Erik) > Hi Stefan, > > Stefan Sperling wrote: > >> Fixes compilation error on OpenBSD: >> sha1_file.c: In function 'open_packed_git_1': >> sha1_file.c:718: error: storage size of 'lim' isn't known >> sha1_file.c:721: warning: implicit declaration of function 'getrlimit' >> sha1_file.c:721: error: 'RLIMIT_NOFILE' undeclared (first use in this function) >> sha1_file.c:718: warning: unused variable 'lim' > This also fix the build on FreeBSD 8 (did not test other version). - Arnaud > Good catch. > >> --- a/sha1_file.c >> +++ b/sha1_file.c >> @@ -18,6 +18,10 @@ >>  #include "pack-revindex.h" >>  #include "sha1-lookup.h" >> >> +#include >> +#include >> +#include > > System headers like this tend to go in git-compat-util.h, so > portability fixes having to do with compatibility replacements or > order of inclusion only need to happen in one place. > > In this case, afaict sys/resource.h is not available on mingw, meaning > the #include would probably go in the "#ifndef __MINGW32__" block. > Maybe something like this (untested)? > > -- 8< -- > Subject: compat: add missing #include > > Starting with commit c793430 (Limit file descriptors used by packs, > 2011-02-28), git uses getrlimit to tell how many file descriptors it > can use.  Unfortunately it does not include the header declaring that > function, resulting in compilation errors on OpenBSD: > >  sha1_file.c: In function 'open_packed_git_1': >  sha1_file.c:718: error: storage size of 'lim' isn't known >  sha1_file.c:721: warning: implicit declaration of function 'getrlimit' >  sha1_file.c:721: error: 'RLIMIT_NOFILE' undeclared (first use in this function) >  sha1_file.c:718: warning: unused variable 'lim' > > The standard header to include for this is (which on > some systems itself requires declarations from or > ).  Probably the problem was missed until now because in > current glibc sys/resource.h happens to be included by sys/wait.h. > > MinGW does not provide sys/resource.h (and compat/mingw takes care of > providing getrlimit some other way), so add the missing #include to > the "#ifndef __MINGW32__" block in git-compat-util.h. > > Reported-by: Stefan Sperling > Signed-off-by: Jonathan Nieder > --- >  git-compat-util.h |    1 + >  1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/git-compat-util.h b/git-compat-util.h > index 49b50ee..40498b3 100644 > --- a/git-compat-util.h > +++ b/git-compat-util.h > @@ -118,6 +118,7 @@ >  #endif >  #ifndef __MINGW32__ >  #include > +#include >  #include >  #include >  #include > -- > 1.7.4.1 > > -- > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at  http://vger.kernel.org/majordomo-info.html > ``` ## Stefan Sperling, 2011-03-19 09:09 Subject: Re: [PATCH] Include headers for getrlimit() in sha1_file.c Message-ID: <20110319090927.GA521@jack.stsp.name> URL: https://gitlist.dev/e/20110319090927.GA521%40jack.stsp.name In-Reply-To: <20110318202351.GA22696@elie> ``` On Fri, Mar 18, 2011 at 03:23:52PM -0500, Jonathan Nieder wrote: > diff --git a/git-compat-util.h b/git-compat-util.h > index 49b50ee..40498b3 100644 > --- a/git-compat-util.h > +++ b/git-compat-util.h > @@ -118,6 +118,7 @@ > #endif > #ifndef __MINGW32__ > #include > +#include > #include > #include > #include Works for me. Thanks. ``` ## Jonathan Nieder, 2011-03-31 22:59 Subject: [PATCH maint resend] compat: add missing #include Message-ID: <20110331225909.GA21429@elie> URL: https://gitlist.dev/e/20110331225909.GA21429%40elie In-Reply-To: <20110318202351.GA22696@elie> ``` Date: Fri, 18 Mar 2011 15:23:52 -0500 Starting with commit c793430 (Limit file descriptors used by packs, 2011-02-28), git uses getrlimit to tell how many file descriptors it can use. Unfortunately it does not include the header declaring that function, resulting in compilation errors: sha1_file.c: In function 'open_packed_git_1': sha1_file.c:718: error: storage size of 'lim' isn't known sha1_file.c:721: warning: implicit declaration of function 'getrlimit' sha1_file.c:721: error: 'RLIMIT_NOFILE' undeclared (first use in this function) sha1_file.c:718: warning: unused variable 'lim' The standard header to include for this is (which on some systems itself requires declarations from or ). Probably the problem was missed until now because in current glibc sys/resource.h happens to be included by sys/wait.h. MinGW does not provide sys/resource.h (and compat/mingw takes care of providing getrlimit some other way), so add the missing #include to the "#ifndef __MINGW32__" block in git-compat-util.h. Reported-by: Stefan Sperling Tested-by: Stefan Sperling [on OpenBSD] Tested-by: Arnaud Lacombe [on FreeBSD 8] Signed-off-by: Jonathan Nieder --- Oops, should have sent this as its own message before. Thanks to doug on irc for a ping. git-compat-util.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/git-compat-util.h b/git-compat-util.h index bf947b1..79b5122 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -118,6 +118,7 @@ #endif #ifndef __MINGW32__ #include +#include #include #include #include -- 1.7.4.2 ``` ## Jonathan Nieder, 2011-04-03 19:13 Subject: Re: [PATCH maint resend] compat: add missing #include Message-ID: <20110403191324.GE3830@elie> URL: https://gitlist.dev/e/20110403191324.GE3830%40elie In-Reply-To: <20110331225909.GA21429@elie> ``` Hi Junio, Jonathan Nieder wrote: > Date: Fri, 18 Mar 2011 15:23:52 -0500 [...] > sha1_file.c:721: error: 'RLIMIT_NOFILE' undeclared (first use in this function) [...] > Reported-by: Stefan Sperling > Tested-by: Stefan Sperling [on OpenBSD] > Tested-by: Arnaud Lacombe [on FreeBSD 8] > Signed-off-by: Jonathan Nieder Ping? Would you like a shorter commit message, or was this just lost in the noise? ``` ## Junio C Hamano, 2011-04-03 19:27 Subject: Re: [PATCH maint resend] compat: add missing #include Message-ID: <7vlizrb0ez.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vlizrb0ez.fsf%40alter.siamese.dyndns.org In-Reply-To: <20110403191324.GE3830@elie> ``` Jonathan Nieder writes: > Ping? Would you like a shorter commit message, or was this just lost > in the noise? No, it was sitting in my to-be-applied box. Thanks. ```