commit 5e109c4ab009a5b4c3bb769d8b2d22f9e4ee2c87
author Bram Moolenaar <Bram@vim.org> Mon Jul 26 22:51:28 2010 +0200
committer Bram Moolenaar <Bram@vim.org> Mon Jul 26 22:51:28 2010 +0200
tree 3bf319d351e36d9576d149428e34663739e8a4ae
parent 0ed0eea20689b3bdafe296f4e132679d3977b943

Fix compiler warnings on 64 bit systems.

src/gui.c

diff --git a/src/gui.c b/src/gui.c
index 49014a5..20a48d4 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -4467,23 +4467,23 @@
  */
     int
 gui_do_horiz_scroll(leftcol, compute_longest_lnum)
-    colnr_T	leftcol;
+    long_u	leftcol;
     int		compute_longest_lnum;
 {
     /* no wrapping, no scrolling */
     if (curwin->w_p_wrap)
 	return FALSE;
 
-    if (curwin->w_leftcol == leftcol)
+    if (curwin->w_leftcol == (colnr_T)leftcol)
 	return FALSE;
 
-    curwin->w_leftcol = leftcol;
+    curwin->w_leftcol = (colnr_T)leftcol;
 
     /* When the line of the cursor is too short, move the cursor to the
      * longest visible line. */
     if (vim_strchr(p_go, GO_HORSCROLL) == NULL
 	    && !virtual_active()
-	    && leftcol > scroll_line_len(curwin->w_cursor.lnum))
+	    && (colnr_T)leftcol > scroll_line_len(curwin->w_cursor.lnum))
     {
 	if (compute_longest_lnum)
 	{

src/normal.c

diff --git a/src/normal.c b/src/normal.c
index d880ee6..9e75afc 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -4582,6 +4582,7 @@
 	if (!curwin->w_p_wrap)
 	{
 	    int val, step = 6;
+
 	    if (mod_mask & (MOD_MASK_SHIFT | MOD_MASK_CTRL))
 		step = W_WIDTH(curwin);
 	    val = curwin->w_leftcol + (cap->arg == MSCR_RIGHT ? -step : +step);

src/proto/gui.pro

diff --git a/src/proto/gui.pro b/src/proto/gui.pro
index fa5ce89..29f87ef 100644
--- a/src/proto/gui.pro
+++ b/src/proto/gui.pro
@@ -46,7 +46,7 @@
 void gui_may_update_scrollbars __ARGS((void));
 void gui_update_scrollbars __ARGS((int force));
 int gui_do_scroll __ARGS((void));
-int gui_do_horiz_scroll __ARGS((colnr_T leftcol, int compute_longest_lnum));
+int gui_do_horiz_scroll __ARGS((long_u leftcol, int compute_longest_lnum));
 void gui_check_colors __ARGS((void));
 guicolor_T gui_get_color __ARGS((char_u *name));
 int gui_get_lightness __ARGS((guicolor_T pixel));

src/quickfix.c

diff --git a/src/quickfix.c b/src/quickfix.c
index 883de8c..3ecc81c 100644
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -898,7 +898,7 @@
     qi->qf_lists[qi->qf_curlist].qf_count = 0;
     if (qf_title != NULL)
     {
-	char_u *p = alloc(STRLEN(qf_title) + 2);
+	char_u *p = alloc((int)STRLEN(qf_title) + 2);
 
 	qi->qf_lists[qi->qf_curlist].qf_title = p;
 	if (p != NULL)