Update of /usr/cvsroot/asterisk/include/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv1706/include/asterisk
Modified Files:
channel.h file.h
Log Message:
make ast_waitstream_* return value compatible with platforms that use unsigned
char by default (bug #4455)
Index: channel.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/channel.h,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- channel.h 25 May 2005 17:18:05 -0000 1.85
+++ channel.h 5 Jun 2005 15:04:43 -0000 1.86
@@ -754,11 +754,11 @@
* \param c channel to wait for a digit on
* \param ms how many milliseconds to wait
* Wait for a digit. Returns <0 on error, 0 on no entry, and the digit on
success. */
-char ast_waitfordigit(struct ast_channel *c, int ms);
+int ast_waitfordigit(struct ast_channel *c, int ms);
/* Same as above with audio fd for outputing read audio and ctrlfd to monitor
for
reading. Returns 1 if ctrlfd becomes available */
-char ast_waitfordigit_full(struct ast_channel *c, int ms, int audiofd, int
ctrlfd);
+int ast_waitfordigit_full(struct ast_channel *c, int ms, int audiofd, int
ctrlfd);
/*! Reads multiple digits */
/*!
Index: file.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/file.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- file.h 21 Apr 2005 06:02:44 -0000 1.23
+++ file.h 5 Jun 2005 15:04:43 -0000 1.24
@@ -122,7 +122,7 @@
* Wait for a stream to stop or for any one of a given digit to arrive,
Returns 0
* if the stream finishes, the character if it was interrupted, and -1 on
error
*/
-char ast_waitstream(struct ast_channel *c, const char *breakon);
+int ast_waitstream(struct ast_channel *c, const char *breakon);
/*! Same as waitstream but allows stream to be forwarded or rewound */
/*!
@@ -135,11 +135,11 @@
* Wait for a stream to stop or for any one of a given digit to arrive,
Returns 0
* if the stream finishes, the character if it was interrupted, and -1 on
error
*/
-char ast_waitstream_fr(struct ast_channel *c, const char *breakon, const char
*forward, const char *rewind, int ms);
+int ast_waitstream_fr(struct ast_channel *c, const char *breakon, const char
*forward, const char *rewind, int ms);
/* Same as waitstream, but with audio output to fd and monitored fd checking.
Returns
1 if monfd is ready for reading */
-char ast_waitstream_full(struct ast_channel *c, const char *breakon, int
audiofd, int monfd);
+int ast_waitstream_full(struct ast_channel *c, const char *breakon, int
audiofd, int monfd);
/*! Starts reading from a file */
/*!
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
