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: https://origsvn.digium.com/svn/asterisk/trunk@60714 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/formats/format_wav.c b/formats/format_wav.c
index e9c4e43..194f824 100644 (file)
--- 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 0dee18f..7d33fc9 100644 (file)
--- 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);