]> granicus.if.org Git - vim/commitdiff
updated for version 7.3.1255 v7.3.1255
authorBram Moolenaar <Bram@vim.org>
Thu, 27 Jun 2013 20:36:03 +0000 (22:36 +0200)
committerBram Moolenaar <Bram@vim.org>
Thu, 27 Jun 2013 20:36:03 +0000 (22:36 +0200)
Problem:    Clang warnings when building with Athena.
Solution:   Add type casts. (Dominique Pelle)

src/gui_at_fs.c
src/version.c

index 25767c2c790cf89ac886ca34a820587da7dabf97..2d73885aa458bf992e5bb5f0934200e8ca595eb5 100644 (file)
@@ -2591,7 +2591,7 @@ SFcreateWidgets(toplevel, prompt, ok, cancel)
                (XtCallbackProc)SFvFloatSliderMovedCallback,
                (XtPointer)(long_u)n);
        XtAddCallback(selFileVScrolls[n], XtNscrollProc,
-               (XtCallbackProc)SFvAreaSelectedCallback, (XtPointer)n);
+               (XtCallbackProc)SFvAreaSelectedCallback, (XtPointer)(long_u)n);
 
        selFileHScrolls[n] = XtVaCreateManagedWidget("selFileHScroll",
 #ifdef FEAT_GUI_NEXTAW
@@ -2616,7 +2616,7 @@ SFcreateWidgets(toplevel, prompt, ok, cancel)
                (XtCallbackProc)SFhSliderMovedCallback,
                (XtPointer)(long_u)n);
        XtAddCallback(selFileHScrolls[n], XtNscrollProc,
-               (XtCallbackProc)SFhAreaSelectedCallback, (XtPointer)n);
+               (XtCallbackProc)SFhAreaSelectedCallback, (XtPointer)(long_u)n);
     }
 
     selFileOK = XtVaCreateManagedWidget("selFileOK",
index 6f0225325dcfb822939f29c170b7dbc14202f1c7..b0855c1aff39ad3b321bd61f48c224c1ea05f987 100644 (file)
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1255,
 /**/
     1254,
 /**/