[2849] in BarnOwl Developers
Re: [PATCH] Don't use error_message if we are building without Zephyr.
daemon@ATHENA.MIT.EDU (Nelson Elhage)
Tue Jan 4 11:58:00 2011
In-Reply-To: <alpine.DEB.1.10.1101041113040.15170@dr-wily.mit.edu>
Date: Tue, 4 Jan 2011 11:57:58 -0500
From: Nelson Elhage <nelhage@nelhage.com>
To: David A Benjamin <davidben@mit.edu>
Cc: Nelson Elhage <nelhage@mit.edu>, barnowl-dev@mit.edu,
Nelson Elhage <nelhage@ksplice.com>
--000e0cd32cf0ac1a8e0499082b12
Content-Type: text/plain; charset=UTF-8
Oh hey. I had "#ifdef it out", but the # ended up at start-of-line and was
interpreted as a comment.
On Jan 4, 2011 11:13 AM, "David A Benjamin" <davidben@mit.edu> wrote:
> LGTM.
>
> (I assume the commit message was supposed to be longer? :-D)
>
> David
>
> On Tue, 4 Jan 2011, Nelson Elhage wrote:
>
>> That code path will never actually be executed if we don't have Zephyr,
so let's
>> ---
>> functions.c | 5 +++++
>> 1 files changed, 5 insertions(+), 0 deletions(-)
>>
>> diff --git a/functions.c b/functions.c
>> index 1f2aa12..2619977 100644
>> --- a/functions.c
>> +++ b/functions.c
>> @@ -375,6 +375,7 @@ void owl_callback_zwrite(owl_editwin *e) {
>> /* send, log and display an outgoing zephyr. If 'msg' is NULL
>> * the message is expected to be set from the zwrite line itself
>> */
>> +#ifdef HAVE_LIBZEPHYR
>> void owl_function_zwrite(owl_zwrite *z, const char *msg)
>> {
>> owl_message *m;
>> @@ -409,6 +410,10 @@ void owl_function_zwrite(owl_zwrite *z, const char
*msg)
>> }
>> }
>> }
>> +#else
>> +void owl_function_zwrite(owl_zwrite *z, const char *msg) {
>> +}
>> +#endif
>>
>> /* send, log and display an outgoing zcrypt zephyr. If 'msg' is NULL
>> * the message is expected to be set from the zwrite line itself
>> --
>> 1.7.3.4
>>
>>
--000e0cd32cf0ac1a8e0499082b12
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
<p>Oh hey. I had "#ifdef it out", but the # ended up at start-of-=
line and was interpreted as a comment.</p>
<div class=3D"gmail_quote">On Jan 4, 2011 11:13 AM, "David A Benjamin&=
quot; <<a href=3D"mailto:davidben@mit.edu">davidben@mit.edu</a>> wrot=
e:<br type=3D"attribution">> LGTM.<br>> <br>> (I assume the commit=
message was supposed to be longer? :-D)<br>
> <br>> David<br>> <br>> On Tue, 4 Jan 2011, Nelson Elhage wrot=
e:<br>> <br>>> That code path will never actually be executed if w=
e don't have Zephyr, so let's<br>>> ---<br>>> functions=
.c | 5 +++++<br>
>> 1 files changed, 5 insertions(+), 0 deletions(-)<br>>><br>&g=
t;> diff --git a/functions.c b/functions.c<br>>> index 1f2aa12..26=
19977 100644<br>>> --- a/functions.c<br>>> +++ b/functions.c<br=
>
>> @@ -375,6 +375,7 @@ void owl_callback_zwrite(owl_editwin *e) {<br>=
>> /* send, log and display an outgoing zephyr. If 'msg' is =
NULL<br>>> * the message is expected to be set from the zwrite line =
itself<br>
>> */<br>>> +#ifdef HAVE_LIBZEPHYR<br>>> void owl_functi=
on_zwrite(owl_zwrite *z, const char *msg)<br>>> {<br>>> owl_m=
essage *m;<br>>> @@ -409,6 +410,10 @@ void owl_function_zwrite(owl_zw=
rite *z, const char *msg)<br>
>> }<br>>> }<br>>> }<br>>> +#else<br>>>=
+void owl_function_zwrite(owl_zwrite *z, const char *msg) {<br>>> +}=
<br>>> +#endif<br>>><br>>> /* send, log and display an ou=
tgoing zcrypt zephyr. If 'msg' is NULL<br>
>> * the message is expected to be set from the zwrite line itself<b=
r>>> -- <br>>> 1.7.3.4<br>>><br>>><br></div>
--000e0cd32cf0ac1a8e0499082b12--
