aboutsummaryrefslogtreecommitdiffstats
path: root/include/asterisk/channel.h
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-10-01 21:18:14 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-10-01 21:18:14 +0000
commitcd372e32c76de742d9268f9cfc27fe47cfdd3e6a (patch)
tree9a6238e1a10bfecdf9204528fb9d3dd01c4a10d3 /include/asterisk/channel.h
parent23d4b6f29c5684ecd10e8ebcb3da3a0534a12d7d (diff)
parent85bbd1354ca1a7d5d9c028fb7f2223b279696fe5 (diff)
Copy 1.6.0-rc6 -> 1.6.0
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.0@145555 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk/channel.h')
-rw-r--r--include/asterisk/channel.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index a3d73c9da..cc733b344 100644
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -588,10 +588,6 @@ enum {
/*! This flag indicates that on a masquerade, an active stream should not
* be carried over */
AST_FLAG_MASQ_NOSTREAM = (1 << 16),
- /*! This flag indicates that the hangup exten was run when the bridge terminated,
- * a message aimed at preventing a subsequent hangup exten being run at the pbx_run
- * level */
- AST_FLAG_BRIDGE_HANGUP_RUN = (1 << 17),
};
/*! \brief ast_bridge_config flags */
@@ -603,7 +599,6 @@ enum {
AST_FEATURE_AUTOMON = (1 << 4),
AST_FEATURE_PARKCALL = (1 << 5),
AST_FEATURE_AUTOMIXMON = (1 << 6),
- AST_FEATURE_NO_H_EXTEN = (1 << 7),
};
/*! \brief bridge configuration */