From: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
To: Romain Naour <romain.naour@openwide.fr>
Cc: xenomai@xenomai.org
Subject: Re: [Xenomai] [PATCH 1/1] posix: fix build failure when HAVE_OPEN64 is undefined.
Date: Sun, 29 Dec 2013 21:51:30 +0100 [thread overview]
Message-ID: <52C08B52.5000701@xenomai.org> (raw)
In-Reply-To: <52C0894B.305@openwide.fr>
On 12/29/2013 09:42 PM, Romain Naour wrote:
> Le 29/12/2013 18:56, Gilles Chanteperdrix a écrit :
>> On 12/29/2013 06:00 PM, Romain Naour wrote:
>>> fixes: http://autobuild.buildroot.org/results/d59/d590be34637a4043c929ce615f9db504484be435/build-end.log
>>>
>>> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
>>> ---
>>> src/skins/posix/rtdm.c | 3 ++-
>>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/src/skins/posix/rtdm.c b/src/skins/posix/rtdm.c
>>> index 5840c64..d6c87dc 100644
>>> --- a/src/skins/posix/rtdm.c
>>> +++ b/src/skins/posix/rtdm.c
>>> @@ -107,8 +107,9 @@ int __wrap_open64(const char *path, int oflag, ...)
>>> errno = EMFILE;
>>> ret = -1;
>>> }
>>> + }
>>> #endif
>>> - } else {
>>> + else {
>>> errno = -ret;
>>> ret = -1;
>>> }
>>>
>> xenomai-2.6$ git apply ~/foo.eml
>> /home/gilles/foo.eml:79: trailing whitespace.
>> }
>> /home/gilles/foo.eml:82: trailing whitespace.
>> else {
>> error: patch failed: src/skins/posix/rtdm.c:107
>> error: src/skins/posix/rtdm.c: patch does not apply
>>
>> Are you working from xenomai-2.6 git?
>>
> I have no error while I do:
> git diff --check HEAD HEAD~1
>
> But I'm able to reproduce this error when I save the email to foo.eml
> with Thunderbird...
>
> Have you whitespace errors with my previous patch too ?
git am accepts the patch, it seems git apply does not because of
whitespace issues. I believe you did not introduce the whitespace
issues, they were there before.
>
> Best regards,
> Romain Naour
>
--
Gilles.
prev parent reply other threads:[~2013-12-29 20:51 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-29 17:00 [Xenomai] [PATCH 1/1] posix: fix build failure when HAVE_OPEN64 is undefined Romain Naour
2013-12-29 17:51 ` Gilles Chanteperdrix
2013-12-29 17:56 ` Gilles Chanteperdrix
2013-12-29 18:00 ` Romain Naour
2013-12-29 20:42 ` Romain Naour
2013-12-29 20:51 ` Gilles Chanteperdrix [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=52C08B52.5000701@xenomai.org \
--to=gilles.chanteperdrix@xenomai.org \
--cc=romain.naour@openwide.fr \
--cc=xenomai@xenomai.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.