aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2007-04-08 14:20:42 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2007-04-08 14:20:42 +0000
commita5ec72af43dd1c8b6e02da622deb2b33bc7ce57a (patch)
tree80a1dc8ae929b6ea6681416bffa1c6398242f36b
parentd8cc79585b719bca96b55ea1a62687ed44e8642d (diff)
Merged revisions 60712 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r60712 | tilghman | 2007-04-08 09:12:00 -0500 (Sun, 08 Apr 2007) | 2 lines Fix --enable-dev-mode ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@60714 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--formats/format_wav.c4
-rw-r--r--main/http.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/formats/format_wav.c b/formats/format_wav.c
index e9c4e4303..194f82458 100644
--- a/formats/format_wav.c
+++ b/formats/format_wav.c
@@ -350,7 +350,9 @@ static struct ast_frame *wav_read(struct ast_filestream *s, int *whennext)
{
int res;
int samples; /* actual samples read */
+#if __BYTE_ORDER == __BIG_ENDIAN
int x;
+#endif
short *tmp;
int bytes = WAV_BUF_SIZE; /* in bytes */
off_t here;
@@ -389,8 +391,8 @@ static struct ast_frame *wav_read(struct ast_filestream *s, int *whennext)
static int wav_write(struct ast_filestream *fs, struct ast_frame *f)
{
- int x;
#if __BYTE_ORDER == __BIG_ENDIAN
+ int x;
short tmp[8000], *tmpi;
#endif
struct wav_desc *s = (struct wav_desc *)fs->private;
diff --git a/main/http.c b/main/http.c
index 0dee18faa..7d33fc970 100644
--- a/main/http.c
+++ b/main/http.c
@@ -403,7 +403,7 @@ static void post_raw(struct mm_mimepart *part, const char *post_dir, const char
body_len = mm_mimepart_getlength(part);
if (option_debug)
- ast_log(LOG_DEBUG, "Body length is %ld\n", body_len);
+ ast_log(LOG_DEBUG, "Body length is %ld\n", (long int)body_len);
fwrite(body, 1, body_len, f);