aboutsummaryrefslogtreecommitdiffstats
path: root/include/asterisk
diff options
context:
space:
mode:
authormurf <murf@f38db490-d61c-443f-a65b-d21fe96a405b>2007-07-17 19:40:29 +0000
committermurf <murf@f38db490-d61c-443f-a65b-d21fe96a405b>2007-07-17 19:40:29 +0000
commitcdfb9990ad122b984e00eed53e8f2f7858e3338f (patch)
tree7e225066fa0140f45cb6f8338bcade84fdc30ec1 /include/asterisk
parenta139ab742b8a9b652bcc6e79f4d195889e5c61f2 (diff)
via 10206, I have added an option (e) to Dial to allow the h exten to get run on peer. Had to upgrade ast_flag stuff to 64 bits to do this.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@75400 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk')
-rw-r--r--include/asterisk/abstract_jb.h4
-rw-r--r--include/asterisk/cdr.h2
-rw-r--r--include/asterisk/channel.h4
-rw-r--r--include/asterisk/chanspy.h2
-rw-r--r--include/asterisk/dundi.h2
-rw-r--r--include/asterisk/features.h2
-rw-r--r--include/asterisk/jabber.h4
-rw-r--r--include/asterisk/module.h2
-rw-r--r--include/asterisk/speech.h2
-rw-r--r--include/asterisk/utils.h6
10 files changed, 15 insertions, 15 deletions
diff --git a/include/asterisk/abstract_jb.h b/include/asterisk/abstract_jb.h
index 145256fcf..37ff5b9d3 100644
--- a/include/asterisk/abstract_jb.h
+++ b/include/asterisk/abstract_jb.h
@@ -55,7 +55,7 @@ enum {
struct ast_jb_conf
{
/*! \brief Combination of the AST_JB_ENABLED, AST_JB_FORCED and AST_JB_LOG flags. */
- unsigned int flags;
+ uint64_t flags;
/*! \brief Max size of the jitterbuffer implementation. */
long max_size;
/*! \brief Resynchronization threshold of the jitterbuffer implementation. */
@@ -98,7 +98,7 @@ struct ast_jb
/*! \brief File for frame timestamp tracing. */
FILE *logfile;
/*! \brief Jitterbuffer internal state flags. */
- unsigned int flags;
+ uint64_t flags;
};
diff --git a/include/asterisk/cdr.h b/include/asterisk/cdr.h
index cdbf35e09..f8d4b5d8d 100644
--- a/include/asterisk/cdr.h
+++ b/include/asterisk/cdr.h
@@ -83,7 +83,7 @@ struct ast_cdr {
/*! What account number to use */
char accountcode[AST_MAX_ACCOUNT_CODE];
/*! flags */
- unsigned int flags;
+ uint64_t flags;
/*! Unique Channel Identifier */
char uniqueid[32];
/*! User field */
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 9bfc3dd4d..0a5b7c1a0 100644
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -468,7 +468,7 @@ struct ast_channel {
(see \ref AstChanVar ) */
ast_group_t callgroup; /*!< Call group for call pickups */
ast_group_t pickupgroup; /*!< Pickup group - which calls groups can be picked up? */
- unsigned int flags; /*!< channel flags of AST_FLAG_ type */
+ uint64_t flags; /*!< channel flags of AST_FLAG_ type */
unsigned short transfercapability; /*!< ISDN Transfer Capbility - AST_FLAG_DIGITAL is not enough */
AST_LIST_HEAD_NOLOCK(, ast_frame) readq;
int alertpipe[2];
@@ -567,7 +567,7 @@ struct ast_bridge_config {
const char *end_sound;
const char *start_sound;
int firstpass;
- unsigned int flags;
+ uint64_t flags;
};
struct chanmon;
diff --git a/include/asterisk/chanspy.h b/include/asterisk/chanspy.h
index 8550210d0..f8a979dd5 100644
--- a/include/asterisk/chanspy.h
+++ b/include/asterisk/chanspy.h
@@ -61,7 +61,7 @@ struct ast_channel_spy {
struct ast_channel *chan;
struct ast_channel_spy_queue read_queue;
struct ast_channel_spy_queue write_queue;
- unsigned int flags;
+ uint64_t flags;
enum chanspy_states status;
const char *type;
/* The volume adjustment values are very straightforward:
diff --git a/include/asterisk/dundi.h b/include/asterisk/dundi.h
index e588338ae..bc64576ef 100644
--- a/include/asterisk/dundi.h
+++ b/include/asterisk/dundi.h
@@ -192,7 +192,7 @@ struct dundi_peer_status {
#define DEFAULT_MAXMS 2000
struct dundi_result {
- unsigned int flags;
+ uint64_t flags;
int weight;
int expiration;
int techint;
diff --git a/include/asterisk/features.h b/include/asterisk/features.h
index 5e9d5f3d2..c59acca16 100644
--- a/include/asterisk/features.h
+++ b/include/asterisk/features.h
@@ -39,7 +39,7 @@ struct ast_call_feature {
char exten[FEATURE_MAX_LEN];
char default_exten[FEATURE_MAX_LEN];
int (*operation)(struct ast_channel *chan, struct ast_channel *peer, struct ast_bridge_config *config, char *code, int sense);
- unsigned int flags;
+ uint64_t flags;
char app[FEATURE_APP_LEN];
char app_args[FEATURE_APP_ARGS_LEN];
char moh_class[FEATURE_MOH_LEN];
diff --git a/include/asterisk/jabber.h b/include/asterisk/jabber.h
index 53c3fbed5..028d0bc3a 100644
--- a/include/asterisk/jabber.h
+++ b/include/asterisk/jabber.h
@@ -102,7 +102,7 @@ struct aji_buddy {
char channel[160];
struct aji_resource *resources;
enum aji_btype btype;
- unsigned int flags;
+ uint64_t flags;
};
struct aji_buddy_container {
@@ -137,7 +137,7 @@ struct aji_client {
int timeout;
int message_timeout;
int authorized;
- unsigned int flags;
+ uint64_t flags;
int component; /* 0 client, 1 component */
struct aji_buddy_container buddies;
AST_LIST_HEAD(messages,aji_message) messages;
diff --git a/include/asterisk/module.h b/include/asterisk/module.h
index d53e6086c..d75e2d4fc 100644
--- a/include/asterisk/module.h
+++ b/include/asterisk/module.h
@@ -215,7 +215,7 @@ struct ast_module_info {
*/
const char *key;
- unsigned int flags;
+ uint64_t flags;
};
void ast_module_register(const struct ast_module_info *);
diff --git a/include/asterisk/speech.h b/include/asterisk/speech.h
index 02d056f33..b3b853bf2 100644
--- a/include/asterisk/speech.h
+++ b/include/asterisk/speech.h
@@ -51,7 +51,7 @@ struct ast_speech {
/*! Structure lock */
ast_mutex_t lock;
/*! Set flags */
- unsigned int flags;
+ uint64_t flags;
/*! Processing sound (used when engine is processing audio and getting results) */
char *processing_sound;
/*! Current state of structure */
diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h
index 76f90c7b0..e87157f2f 100644
--- a/include/asterisk/utils.h
+++ b/include/asterisk/utils.h
@@ -50,7 +50,7 @@
your variable.
The flag macros below use a set of compiler tricks to verify
- that the caller is using an "unsigned int" variable to hold
+ that the caller is using an "unsigned long long" variable to hold
the flags, and nothing else. If the caller uses any other
type of variable, a warning message similar to this:
@@ -64,7 +64,7 @@
\endverbatim
*/
-extern unsigned int __unsigned_int_flags_dummy;
+extern uint64_t __unsigned_int_flags_dummy;
#define ast_test_flag(p,flag) ({ \
typeof ((p)->flags) __p = (p)->flags; \
@@ -146,7 +146,7 @@ extern unsigned int __unsigned_int_flags_dummy;
/*! \brief Structure used to handle boolean flags
*/
struct ast_flags {
- unsigned int flags;
+ uint64_t flags;
};
struct ast_hostent {