summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2013-06-27 22:36:03 +0200
committerBram Moolenaar <bram@vim.org>2013-06-27 22:36:03 +0200
commit0a5b610cc8700581fa378f12994df99634d11b22 (patch)
treec7e1f670208b8a84da5522ff414de05c54955f48
parent92965ad896cb329f3ceadb13561999466a5c9e48 (diff)
downloadvim-0a5b610cc8700581fa378f12994df99634d11b22.tar.gz
updated for version 7.3.1255v7.3.1255v7-3-1255
Problem: Clang warnings when building with Athena. Solution: Add type casts. (Dominique Pelle)
-rw-r--r--src/gui_at_fs.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/gui_at_fs.c b/src/gui_at_fs.c
index 25767c2c..2d73885a 100644
--- a/src/gui_at_fs.c
+++ b/src/gui_at_fs.c
@@ -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",
diff --git a/src/version.c b/src/version.c
index 6f022532..b0855c1a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1255,
+/**/
1254,
/**/
1253,