diff -urd asterisk/app.c asterisk-modified/app.c
--- asterisk/app.c	2005-01-29 08:53:33.000000000 +0200
+++ asterisk-modified/app.c	2005-06-04 10:35:00.000000000 +0300
@@ -520,7 +520,8 @@
 
 int ast_play_and_record(struct ast_channel *chan, char *playfile, char *recordfile, int maxtime, char *fmt, int *duration, int silencethreshold, int maxsilence, const char *path)
 {
-	char d, *fmts;
+	int d;
+	char *fmts;
 	char comment[256];
 	int x, fmtcnt=1, res=-1,outmsg=0;
 	struct ast_frame *f;
@@ -736,7 +737,8 @@
 
 int ast_play_and_prepend(struct ast_channel *chan, char *playfile, char *recordfile, int maxtime, char *fmt, int *duration, int beep, int silencethreshold, int maxsilence)
 {
-	char d = 0, *fmts;
+	int d = 0;
+	char *fmts;
 	char comment[256];
 	int x, fmtcnt=1, res=-1,outmsg=0;
 	struct ast_frame *f;
diff -urd asterisk/channel.c asterisk-modified/channel.c
--- asterisk/channel.c	2005-05-16 06:10:20.000000000 +0300
+++ asterisk-modified/channel.c	2005-06-04 10:34:09.000000000 +0300
@@ -1089,11 +1089,11 @@
 	return ms;
 }
 
-char ast_waitfordigit(struct ast_channel *c, int ms)
+int ast_waitfordigit(struct ast_channel *c, int ms)
 {
 	/* XXX Should I be merged with waitfordigit_full XXX */
 	struct ast_frame *f;
-	char result = 0;
+	int result = 0;
 	/* Stop if we're a zombie or need a soft hangup */
 	if (c->zombie || ast_check_hangup(c)) 
 		return -1;
@@ -1133,7 +1133,7 @@
 #endif	
 	return res;
 }
-char ast_waitfordigit_full(struct ast_channel *c, int ms, int audiofd, int cmdfd)
+int ast_waitfordigit_full(struct ast_channel *c, int ms, int audiofd, int cmdfd)
 {
 	struct ast_frame *f;
 	struct ast_channel *rchan;
@@ -2013,7 +2013,7 @@
 {
 	int pos=0;
 	int to = ftimeout;
-	char d;
+	int d;
 	/* XXX Merge with full version? XXX */
 	/* Stop if we're a zombie or need a soft hangup */
 	if (c->zombie || ast_check_hangup(c)) 
@@ -2052,7 +2052,7 @@
 {
 	int pos=0;
 	int to = ftimeout;
-	char d;
+	int d;
 	/* Stop if we're a zombie or need a soft hangup */
 	if (c->zombie || ast_check_hangup(c)) 
 		return -1;
diff -urd asterisk/file.c asterisk-modified/file.c
--- asterisk/file.c	2005-05-31 06:36:45.000000000 +0300
+++ asterisk-modified/file.c	2005-06-04 10:22:43.000000000 +0300
@@ -932,7 +932,7 @@
 	return fs;
 }
 
-char ast_waitstream(struct ast_channel *c, char *breakon)
+int ast_waitstream(struct ast_channel *c, char *breakon)
 {
 	/* XXX Maybe I should just front-end ast_waitstream_full ? XXX */
 	int res;
@@ -988,7 +988,7 @@
 	return (c->_softhangup ? -1 : 0);
 }
 
-char ast_waitstream_fr(struct ast_channel *c, char *breakon, char *forward, char *rewind, int ms)
+int ast_waitstream_fr(struct ast_channel *c, char *breakon, char *forward, char *rewind, int ms)
 {
 	int res;
 	struct ast_frame *fr;
@@ -1057,7 +1057,7 @@
 	return (c->_softhangup ? -1 : 0);
 }
 
-char ast_waitstream_full(struct ast_channel *c, char *breakon, int audiofd, int cmdfd)
+int ast_waitstream_full(struct ast_channel *c, char *breakon, int audiofd, int cmdfd)
 {
 	int res;
 	int ms;
diff -urd asterisk/include/asterisk/channel.h asterisk-modified/include/asterisk/channel.h
--- asterisk/include/asterisk/channel.h	2004-11-08 02:08:58.000000000 +0200
+++ asterisk-modified/include/asterisk/channel.h	2005-06-04 10:22:28.000000000 +0300
@@ -643,11 +643,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
 /*! 
diff -urd asterisk/include/asterisk/file.h asterisk-modified/include/asterisk/file.h
--- asterisk/include/asterisk/file.h	2005-02-14 05:06:37.000000000 +0200
+++ asterisk-modified/include/asterisk/file.h	2005-06-04 10:22:59.000000000 +0300
@@ -121,7 +121,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, char *breakon);
+int ast_waitstream(struct ast_channel *c, char *breakon);
 
 //! Same as waitstream but allows stream to be forwarded or rewound
 /*!
@@ -134,11 +134,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, char *breakon, char *forward, char *rewind, int ms);
+int ast_waitstream_fr(struct ast_channel *c, char *breakon, char *forward, 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, char *breakon, int audiofd, int monfd);
+int ast_waitstream_full(struct ast_channel *c, char *breakon, int audiofd, int monfd);
 
 //! Starts reading from a file
 /*!
diff -urd asterisk/pbx.c asterisk-modified/pbx.c
--- asterisk/pbx.c	2005-05-16 02:26:29.000000000 +0300
+++ asterisk-modified/pbx.c	2005-06-04 10:34:23.000000000 +0300
@@ -1775,7 +1775,7 @@
 int ast_pbx_run(struct ast_channel *c)
 {
 	int firstpass = 1;
-	char digit;
+	int digit;
 	char exten[256];
 	int pos;
 	int waittime;
Only in asterisk-modified: .version