aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2000-01-02 20:59:00 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2000-01-02 20:59:00 +0000
commit999d3524e27900ec85d461f644d0e2fde138fca4 (patch)
tree53bb1d4c35295fea70d6179bfa71cd1e10d402df /include
parent2137f5008cf14c94312348e272f9b38df43233e1 (diff)
Version 0.1.2 from FTP
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@152 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
-rwxr-xr-xinclude/asterisk/channel.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 425eb2e30..d78c490d1 100755
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -143,12 +143,14 @@ char ast_waitfordigit(struct ast_channel *c, int ms);
for the first digit */
int ast_readstring(struct ast_channel *c, char *s, int len, int timeout, int rtimeout, char *enders);
#define CHECK_BLOCKING(c) { \
- if ((c)->blocking) \
+ if ((c)->blocking) {\
ast_log(LOG_WARNING, "Blocking '%s', already blocked by thread %ld in procedure %s\n", (c)->name, (c)->blocker, (c)->blockproc); \
- else { \
+ /* *((int *)0)=0; */ \
+ } else { \
(c)->blocker = pthread_self(); \
(c)->blockproc = __PRETTY_FUNCTION__; \
- c->blocking = -1; } }
+ c->blocking = -1; \
+ } }
#if defined(__cplusplus) || defined(c_plusplus)
}