diff options
author | Joshua Colp <jcolp@digium.com> | 2016-08-26 14:03:05 -0500 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-08-26 14:03:05 -0500 |
commit | 179e8c15c8198983710d34d8416c4d9f62afb29c (patch) | |
tree | 7c99e3b8eb7211252547eaf52b814d7db4231642 /include | |
parent | 383b35fca746cbd64f3dc490f5dfb8153b696265 (diff) | |
parent | 277a2d667a51b4f683392304f0d1be47b53b1db2 (diff) |
Merge "res_fax: Fix deadlock setting FAXMODE channel variable."
Diffstat (limited to 'include')
-rw-r--r-- | include/asterisk/res_fax.h | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/include/asterisk/res_fax.h b/include/asterisk/res_fax.h index 5119bfa6c..e88d8002f 100644 --- a/include/asterisk/res_fax.h +++ b/include/asterisk/res_fax.h @@ -20,16 +20,16 @@ #ifndef _ASTERISK_RES_FAX_H #define _ASTERISK_RES_FAX_H -#include <asterisk.h> -#include <asterisk/lock.h> -#include <asterisk/linkedlists.h> -#include <asterisk/module.h> -#include <asterisk/utils.h> -#include <asterisk/options.h> -#include <asterisk/frame.h> -#include <asterisk/cli.h> -#include <asterisk/stringfields.h> -#include <asterisk/manager.h> +#include "asterisk.h" +#include "asterisk/lock.h" +#include "asterisk/linkedlists.h" +#include "asterisk/module.h" +#include "asterisk/utils.h" +#include "asterisk/options.h" +#include "asterisk/frame.h" +#include "asterisk/cli.h" +#include "asterisk/stringfields.h" +#include "asterisk/manager.h" /*! \brief capabilities for res_fax to locate a fax technology module */ enum ast_fax_capabilities { @@ -187,6 +187,8 @@ struct ast_fax_session_details { int faxdetect_timeout; /*! flags used for fax detection */ int faxdetect_flags; + /*! Non-zero if T.38 is negotiated */ + int is_t38_negotiated; }; struct ast_fax_tech; |