[svn-commits] kmoore: branch 12 r413597 - in /branches/12: ./ funcs/func_env.c

[SVN commits to the Digium repositories]

Author: kmoore
Date: Fri May  9 18:13:19 2014
New Revision: 413597

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=413597
Log:
Fix 32bit build for func_env
........

Merged revisions 413592 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 413595 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    branches/12/   (props changed)
    branches/12/funcs/func_env.c

Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: branches/12/funcs/func_env.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/funcs/func_env.c?view=diff&rev=413597&r1=413596&r2=413597
==============================================================================
--- branches/12/funcs/func_env.c (original)
+++ branches/12/funcs/func_env.c Fri May  9 18:13:19 2014
@@ -699,7 +699,7 @@
 			if (fread(fbuf, 1, i + sizeof(fbuf) > flength ? flength - i : sizeof(fbuf), ff) < (i + sizeof(fbuf) > flength ? flength - i : sizeof(fbuf))) {
 				ast_log(LOG_ERROR, "Short read?!!\n");
 			}
-			ast_debug(3, "Appending first %" PRId64" bytes of fbuf=%s\n", (long)(i + sizeof(fbuf) > length_offset ? length_offset - i : sizeof(fbuf)), fbuf);
+			ast_debug(3, "Appending first %" PRId64" bytes of fbuf=%s\n", (int64_t)(i + sizeof(fbuf) > length_offset ? length_offset - i : sizeof(fbuf)), fbuf);
 			ast_str_append_substr(buf, len, fbuf, i + sizeof(fbuf) > length_offset ? length_offset - i : sizeof(fbuf));
 		}
 	} else if (length == 0) {