aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authormmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-12-15 19:54:18 +0000
committermmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-12-15 19:54:18 +0000
commit95cdb5eadc71ad1c7b9d49d8f0f5def8be974b0a (patch)
tree466a98319a31913dccaa3ac3032bd6fddbd0274f /include
parentca338f66f96a776e54bc73b22cab23a3e43d1d8b (diff)
Merged revisions 164423 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r164423 | mmichelson | 2008-12-15 13:53:29 -0600 (Mon, 15 Dec 2008) | 11 lines Merged revisions 164422 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r164422 | mmichelson | 2008-12-15 13:53:08 -0600 (Mon, 15 Dec 2008) | 3 lines Add the deadlock note to ast_spawn_extension as well ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@164425 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
-rw-r--r--include/asterisk/pbx.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asterisk/pbx.h b/include/asterisk/pbx.h
index eacee2e90..68bf0ccee 100644
--- a/include/asterisk/pbx.h
+++ b/include/asterisk/pbx.h
@@ -495,6 +495,10 @@ int ast_extension_cmp(const char *a, const char *b);
*
* This adds a new extension to the asterisk extension list.
*
+ * \note It is possible for autoservice to be started and stopped on c during this
+ * function call, it is important that c is not locked prior to calling this. Otherwise
+ * a deadlock may occur
+ *
* \retval 0 on success
* \retval -1 on failure.
*/