[svn-commits] tilghman: trunk r60714 - in /trunk: ./ formats/format_wav.c main/http.c

[svn-commits at lists.digium.com]

Author: tilghman
Date: Sun Apr  8 09:20:42 2007
New Revision: 60714

URL: http://svn.digium.com/view/asterisk?view=rev&rev=60714
Log:
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

........

Modified:
    trunk/   (props changed)
    trunk/formats/format_wav.c
    trunk/main/http.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/formats/format_wav.c
URL: http://svn.digium.com/view/asterisk/trunk/formats/format_wav.c?view=diff&rev=60714&r1=60713&r2=60714
==============================================================================
--- trunk/formats/format_wav.c (original)
+++ trunk/formats/format_wav.c Sun Apr  8 09:20:42 2007
@@ -350,7 +350,9 @@
 {
 	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 int wav_write(struct ast_filestream *fs, struct ast_frame *f)
 {
+#if __BYTE_ORDER == __BIG_ENDIAN
 	int x;
-#if __BYTE_ORDER == __BIG_ENDIAN
 	short tmp[8000], *tmpi;
 #endif
 	struct wav_desc *s = (struct wav_desc *)fs->private;

Modified: trunk/main/http.c
URL: http://svn.digium.com/view/asterisk/trunk/main/http.c?view=diff&rev=60714&r1=60713&r2=60714
==============================================================================
--- trunk/main/http.c (original)
+++ trunk/main/http.c Sun Apr  8 09:20:42 2007
@@ -403,7 +403,7 @@
 	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);