{"thread":{"id":"33572","subject":"[PATCH] zlib: fix compilation failures with Sun C Compilaer","startedAt":"2013-04-22T16:18:40Z","lastAt":"2013-04-22T22:06:07Z","messageCount":6,"participants":["Stefano Lattarini","Junio C Hamano","René Scharfe","Eric Sunshine"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"215099","messageId":"97eabaedd6cd7d876812474a35fa2d3d63dfec4a.1366647415.git.stefano.lattarini@gmail.com","threadId":"33572","inReplyTo":null,"subject":"[PATCH] zlib: fix compilation failures with Sun C Compilaer","fromName":"Stefano Lattarini","fromEmail":"stefano.lattarini@gmail.com","sentAt":"2013-04-22T16:18:40Z","receivedAt":"2013-04-22T16:18:40Z","isPatch":true,"sender":{"key":"stefano.lattarini@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1429199?v=4"},"body":"Do this by removing a couple of useless return statements. Without this\nchange, compilation with Sun C Compiler 5.9 (SunOS_i386 Patch 124868-15\n2010/08/11) fails with the following message:\n\n \"zlib.c\", line 192: void function cannot return value\n \"zlib.c\", line 201: void function cannot return value\n cc: acomp failed for zlib.c\n\nSigned-off-by: Stefano Lattarini \n---\n zlib.c | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/zlib.c b/zlib.c\nindex bbaa081..61e6df0 100644\n--- a/zlib.c\n+++ b/zlib.c\n@@ -189,7 +189,7 @@ void git_deflate_init_gzip(git_zstream *strm, int level)\n \t * Use default 15 bits, +16 is to generate gzip header/trailer\n \t * instead of the zlib wrapper.\n \t */\n-\treturn do_git_deflate_init(strm, level, 15 + 16);\n+\tdo_git_deflate_init(strm, level, 15 + 16);\n }\n \n void git_deflate_init_raw(git_zstream *strm, int level)\n@@ -198,7 +198,7 @@ void git_deflate_init_raw(git_zstream *strm, int level)\n \t * Use default 15 bits, negate the value to get raw compressed\n \t * data without zlib header and trailer.\n \t */\n-\treturn do_git_deflate_init(strm, level, -15);\n+\tdo_git_deflate_init(strm, level, -15);\n }\n \n int git_deflate_abort(git_zstream *strm)\n-- \n1.8.1.rc3.897.gb3600c3\n"},{"id":"215101","messageId":"7vfvyipl4f.fsf@alter.siamese.dyndns.org","threadId":"33572","inReplyTo":"97eabaedd6cd7d876812474a35fa2d3d63dfec4a.1366647415.git.stefano.lattarini@gmail.com","subject":"Re: [PATCH] zlib: fix compilation failures with Sun C Compilaer","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-04-22T16:48:16Z","receivedAt":"2013-04-22T16:48:16Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Stefano Lattarini writes:\n\n> Do this by removing a couple of useless return statements. Without this\n> change, compilation with Sun C Compiler 5.9 (SunOS_i386 Patch 124868-15\n> 2010/08/11) fails with the following message:\n>\n> \"zlib.c\", line 192: void function cannot return value\n> \"zlib.c\", line 201: void function cannot return value\n> cc: acomp failed for zlib.c\n\nThanks for catching a recent regression in the mainline before any\ntagged release is made out of it. Very much appreciated.\n\n>\n> Signed-off-by: Stefano Lattarini \n> ---\n> zlib.c | 4 ++--\n> 1 file changed, 2 insertions(+), 2 deletions(-)\n>\n> diff --git a/zlib.c b/zlib.c\n> index bbaa081..61e6df0 100644\n> --- a/zlib.c\n> +++ b/zlib.c\n> @@ -189,7 +189,7 @@ void git_deflate_init_gzip(git_zstream *strm, int level)\n> \t * Use default 15 bits, +16 is to generate gzip header/trailer\n> \t * instead of the zlib wrapper.\n> \t */\n> -\treturn do_git_deflate_init(strm, level, 15 + 16);\n> +\tdo_git_deflate_init(strm, level, 15 + 16);\n> }\n> \n> void git_deflate_init_raw(git_zstream *strm, int level)\n> @@ -198,7 +198,7 @@ void git_deflate_init_raw(git_zstream *strm, int level)\n> \t * Use default 15 bits, negate the value to get raw compressed\n> \t * data without zlib header and trailer.\n> \t */\n> -\treturn do_git_deflate_init(strm, level, -15);\n> +\tdo_git_deflate_init(strm, level, -15);\n> }\n> \n> int git_deflate_abort(git_zstream *strm)\n"},{"id":"215102","messageId":"51756B47.80609@lsrfire.ath.cx","threadId":"33572","inReplyTo":"97eabaedd6cd7d876812474a35fa2d3d63dfec4a.1366647415.git.stefano.lattarini@gmail.com","subject":"Re: [PATCH] zlib: fix compilation failures with Sun C Compilaer","fromName":"René Scharfe","fromEmail":"rene.scharfe@lsrfire.ath.cx","sentAt":"2013-04-22T16:54:31Z","receivedAt":"2013-04-22T16:54:31Z","isPatch":true,"sender":{"key":"l.s.r@web.de","avatar":"https://avatars.githubusercontent.com/u/26122331?v=4"},"body":"Am 22.04.2013 18:18, schrieb Stefano Lattarini:\n> Do this by removing a couple of useless return statements. Without this\n> change, compilation with Sun C Compiler 5.9 (SunOS_i386 Patch 124868-15\n> 2010/08/11) fails with the following message:\n>\n> \"zlib.c\", line 192: void function cannot return value\n> \"zlib.c\", line 201: void function cannot return value\n> cc: acomp failed for zlib.c\n\nHmm, what was I thinking when I introduced these returns in c3c2e1a0? \n:-/ Thanks for catching!\n\nRené\n"},{"id":"215104","messageId":"5175784A.5060805@gmail.com","threadId":"33572","inReplyTo":"7vfvyipl4f.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] zlib: fix compilation failures with Sun C Compilaer","fromName":"Stefano Lattarini","fromEmail":"stefano.lattarini@gmail.com","sentAt":"2013-04-22T17:50:02Z","receivedAt":"2013-04-22T17:50:02Z","isPatch":true,"sender":{"key":"stefano.lattarini@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1429199?v=4"},"body":"On 04/22/2013 06:48 PM, Junio C Hamano wrote:\n> Stefano Lattarini writes:\n> \n>> Do this by removing a couple of useless return statements. Without this\n>> change, compilation with Sun C Compiler 5.9 (SunOS_i386 Patch 124868-15\n>> 2010/08/11) fails with the following message:\n>>\n>> \"zlib.c\", line 192: void function cannot return value\n>> \"zlib.c\", line 201: void function cannot return value\n>> cc: acomp failed for zlib.c\n> \n> Thanks for catching a recent regression in the mainline before any\n> tagged release is made out of it. Very much appreciated.\n>\nActually, I tried to build the bleeding-edge git on Solaris to use it\nmyself, rather than to test it ;-) So, thanks to you and all the git\ncontributors for continuously improving the package, thus making it\nworth to try to build and use the bleeding-edge version.\n\nBest regards,\n Stefano\n"},{"id":"215159","messageId":"CAPig+cQQiwumaswnKf1A-e5Rk4BHpRQqhqbL0p8zkmDnZ=Cbtg@mail.gmail.com","threadId":"33572","inReplyTo":"97eabaedd6cd7d876812474a35fa2d3d63dfec4a.1366647415.git.stefano.lattarini@gmail.com","subject":"Re: [PATCH] zlib: fix compilation failures with Sun C Compilaer","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2013-04-22T21:41:25Z","receivedAt":"2013-04-22T21:41:25Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Mon, Apr 22, 2013 at 12:18 PM, Stefano Lattarini\n wrote:\n> zlib: fix compilation failures with Sun C Compilaer\n\ns/Compilaer/compiler/\n\n> Do this by removing a couple of useless return statements. Without this\n> change, compilation with Sun C Compiler 5.9 (SunOS_i386 Patch 124868-15\n> 2010/08/11) fails with the following message:\n>\n> \"zlib.c\", line 192: void function cannot return value\n> \"zlib.c\", line 201: void function cannot return value\n> cc: acomp failed for zlib.c\n>\n> Signed-off-by: Stefano Lattarini \n"},{"id":"215178","messageId":"5175B44F.4000303@gmail.com","threadId":"33572","inReplyTo":"CAPig+cQQiwumaswnKf1A-e5Rk4BHpRQqhqbL0p8zkmDnZ=Cbtg@mail.gmail.com","subject":"Re: [PATCH] zlib: fix compilation failures with Sun C Compilaer","fromName":"Stefano Lattarini","fromEmail":"stefano.lattarini@gmail.com","sentAt":"2013-04-22T22:06:07Z","receivedAt":"2013-04-22T22:06:07Z","isPatch":true,"sender":{"key":"stefano.lattarini@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1429199?v=4"},"body":"On 04/22/2013 11:41 PM, Eric Sunshine wrote:\n> On Mon, Apr 22, 2013 at 12:18 PM, Stefano Lattarini\n> wrote:\n>> zlib: fix compilation failures with Sun C Compilaer\n> \n> s/Compilaer/compiler/\n> \nOops, well spotted. Junio, can you fix this locally?\n\nThanks, and sorry for the stupid typo,\n Stefano\n"}]}