svn commit: r1396432 - /subversion/trunk/subversion/svn/file-merge.c

[hwright]

Author: hwright
Date: Wed Oct 10 00:10:45 2012
New Revision: 1396432

URL: http://svn.apache.org/viewvc?rev=1396432&view=rev
Log:
* subversion/svn/file-merge.c
  (prepare_line_for_display): Eliminate integer size mismatch warning.

Modified:
    subversion/trunk/subversion/svn/file-merge.c

Modified: subversion/trunk/subversion/svn/file-merge.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/file-merge.c?rev=1396432&r1=1396431&r2=1396432&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/file-merge.c (original)
+++ subversion/trunk/subversion/svn/file-merge.c Wed Oct 10 00:10:45 2012
@@ -365,7 +365,7 @@ static const char *
 prepare_line_for_display(const char *line, apr_pool_t *pool)
 {
   svn_stringbuf_t *buf = svn_stringbuf_create(line, pool);
-  int width;
+  size_t width;
   int line_width = LINE_DISPLAY_WIDTH;
   apr_pool_t *iterpool;