Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix compiler warnings on 64 bit systems.

--HG--
branch : vim73
  • Loading branch information...
commit 309262c0d96c7d4e6b0f29a166725d4842f8ab72 1 parent 919a34d
Bram Moolenaar authored
View
8 src/gui.c
@@ -4467,23 +4467,23 @@ gui_update_horiz_scrollbar(force)
*/
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)
{
View
1  src/normal.c
@@ -4582,6 +4582,7 @@ nv_mousescroll(cap)
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);
View
2  src/proto/gui.pro
@@ -46,7 +46,7 @@ void gui_drag_scrollbar __ARGS((scrollbar_T *sb, long value, int still_dragging)
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));
View
2  src/quickfix.c
@@ -898,7 +898,7 @@ qf_new_list(qi, qf_title)
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)
Please sign in to comment.
Something went wrong with that request. Please try again.