[asterisk-commits] kpfleming: trunk r43953 - in /trunk: ./ include/asterisk/lock.h

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Thu Sep 28 17:43:24 2006
New Revision: 43953

URL: http://svn.digium.com/view/asterisk?rev=43953&view=rev
Log:
Merged revisions 43952 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r43952 | kpfleming | 2006-09-28 17:42:18 -0500 (Thu, 28 Sep 2006) | 2 lines

eliminate compiler warning when DEBUG_CHANNEL_LOCKS is enabled and users of this header file don't also include channel.h

........

Modified:
    trunk/   (props changed)
    trunk/include/asterisk/lock.h

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/include/asterisk/lock.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/lock.h?rev=43953&r1=43952&r2=43953&view=diff
==============================================================================
--- trunk/include/asterisk/lock.h (original)
+++ trunk/include/asterisk/lock.h Thu Sep 28 17:43:24 2006
@@ -705,6 +705,8 @@
 #define ast_channel_trylock(x)		ast_mutex_trylock(&x->lock)
 #else
 
+struct ast_channel;
+
 /*! \brief Lock AST channel (and print debugging output)
 \note You need to enable DEBUG_CHANNEL_LOCKS for this function */
 int ast_channel_lock(struct ast_channel *chan);