Bug#319304: FTBFS: conflicting declarations of uniquelock

[Steve Langasek]

merge 319304 318337
thanks

On Wed, Jul 20, 2005 at 08:30:13AM -0700, Matt Kraai wrote:
> The attached patch makes the definition in channel.c not use static.

> diff -ru asterisk-1.0.9.dfsg/debian/patches/bristuff-0.2.0-RC8h.dpatch asterisk-1.0.9.dfsg.new/debian/patches/bristuff-0.2.0-RC8h.dpatch
> --- asterisk-1.0.9.dfsg/debian/patches/bristuff-0.2.0-RC8h.dpatch	2005-07-20 09:21:01.000000000 -0700
> +++ asterisk-1.0.9.dfsg.new/debian/patches/bristuff-0.2.0-RC8h.dpatch	2005-07-20 09:13:13.000000000 -0700
> @@ -976,7 +976,7 @@
>  +extern int ast_mainpid; /* provided by asterisk.c */
>   static int shutting_down = 0;
>   static int uniqueint = 0;
> -+AST_MUTEX_DEFINE_STATIC(uniquelock);
> ++AST_MUTEX_DEFINE_EXPORTED(uniquelock);
>   
>   /* XXX Lock appropriately in more functions XXX */
>   
> diff -ru asterisk-1.0.9.dfsg/debian/patches/bristuff-0.2.0-RC8j.dpatch asterisk-1.0.9.dfsg.new/debian/patches/bristuff-0.2.0-RC8j.dpatch
> --- asterisk-1.0.9.dfsg/debian/patches/bristuff-0.2.0-RC8j.dpatch	2005-07-20 09:21:01.000000000 -0700
> +++ asterisk-1.0.9.dfsg.new/debian/patches/bristuff-0.2.0-RC8j.dpatch	2005-07-20 09:13:24.000000000 -0700
> @@ -977,7 +977,7 @@
>  +extern int ast_mainpid; /* provided by asterisk.c */
>   static int shutting_down = 0;
>   static int uniqueint = 0;
> -+AST_MUTEX_DEFINE_STATIC(uniquelock);
> ++AST_MUTEX_DEFINE_EXPORTED(uniquelock);
>   
>   /* XXX Lock appropriately in more functions XXX */

Wrong fix; there's no reason for exporting this mutex in the header to begin
with.

Thanks,
-- 
Steve Langasek
postmodern programmer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : http://lists.alioth.debian.org/pipermail/pkg-voip-maintainers/attachments/20050720/b7207fd7/attachment.pgp