[sr-dev] git:kamailio_3.0: lcr: fix load_gws() 2nd param

[Iñaki Baz Castillo]

2010/8/26 Juha Heinanen <jh at tutpro.com>:
> Jon Bonilla (Manwe) writes:
>
>> Could you please check this commit? All my nightly builds of kamailio_3.0
>> branch have failed while compiling the lcr module and this commit seems to be
>> responsible of that :)
>
> jon,
>
> i don't know what has happened.  i already asked about it on sr-dev
> list.   my kamailio_3.0 commit (below) didn't involve lcr module.
> andrei did an lcr related commit, but i don't know if that did anything
> wrong either.

Hi Juha. For sure your commit is the responsible of this error (I mean
the commit whose mail has started this mail thread).

This is your commit:
  http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5da493e4457dd97a0d9f3e453303c0aa98cdb30c

Note that in the commit comment there also appears:
  -------------------
  Conflicts:
    modules/lcr/lcr_mod.c
  ------------------

And inspecting the diff or the resulting modules/lcr/lcr_mod.c it's
clear that your commit included a git conflict. See line 1698 in
http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=blob;f=modules/lcr/lcr_mod.c;h=c0df7ab956ec50043ab78fab28305018a6f9b156;hb=5da493e4457dd97a0d9f3e453303c0aa98cdb30c


Regards.


-- 
Iñaki Baz Castillo
<ibc at aliax.net>