[asterisk-dev] [asterisk-commits] phsultan: branch 1.6.0 r124871 - in /branches/1.6.0: ./ res/res_jabber.c

[Noel R. Morais]

I think that this merge broke the trunk.

I'm trying to compile it and I've got the follow error:

 [CC] res_jabber.c -> res_jabber.o
res_jabber.c: In function 'aji_start_tls':
res_jabber.c:526: error: 'struct aji_client' has no member named 'stream_flags'
res_jabber.c:526: error: 'TRY_SECURE' undeclared (first use in this function)
res_jabber.c:526: error: (Each undeclared identifier is reported only once
res_jabber.c:526: error: for each function it appears in.)
...

Thanks,

Noel

On Wed, Jun 25, 2008 at 1:42 PM, Russell Bryant <russell at digium.com> wrote:
>
> ----- Philippe Sultan <philippe.sultan at gmail.com> wrote:
>> Yep Sean, you're right. But this commit was small enough to make me
>> wanting to keep 1.6 consistent with trunk :)
>>
>> If you don't mind, I'd rather keep this small modification.
>
> That's fine.  I don't care all that much while 1.6.0 is still in beta.
>
> --
> Russell Bryant
> Senior Software Engineer
> Open Source Team Lead
> Digium, Inc.
>
> _______________________________________________
> --Bandwidth and Colocation Provided by http://www.api-digital.com--
>
> AstriCon 2008 - September 22 - 25 Phoenix, Arizona
> Register Now: http://www.astricon.net
>
> asterisk-dev mailing list
> To UNSUBSCRIBE or update options visit:
>   http://lists.digium.com/mailman/listinfo/asterisk-dev
>