updated for version 7.3.1208

Problem:    Compiler warnings on MS-Windows.
Solution:   Add type cast.  Move variable declaration. (Mike Williams)

diff --git a/src/option.c b/src/option.c
index c18672e4f432ae2b3e8918f17d0d821f76a6849c..f691f506cc33630f5a96ed9bd2add778ca8e19b0 100644 (file)
--- a/src/option.c
+++ b/src/option.c
@@ -3181,7 +3181,7 @@ set_init_1()
            if (opt_idx >= 0)
            {
 #if !defined(HAVE_AVAIL_MEM) && !defined(HAVE_TOTAL_MEM)
-               if ((long)options[opt_idx].def_val[VI_DEFAULT] > n
+               if ((long)options[opt_idx].def_val[VI_DEFAULT] > (long)n
                        || (long)options[opt_idx].def_val[VI_DEFAULT] == 0L)
 #endif
                    options[opt_idx].def_val[VI_DEFAULT] = (char_u *)n;

diff --git a/src/os_mswin.c b/src/os_mswin.c
index 3b2ebe453e9bd6130418f65eb7d10719976f21c3..5af1dee51861cc72209607d3a12a3cd7b379b87e 100644 (file)
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -1897,7 +1897,6 @@ Messaging_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
        HWND            sender = (HWND)wParam;
        COPYDATASTRUCT  reply;
        char_u          *res;
-       char_u          winstr[30];
        int             retval;
        char_u          *str;
        char_u          *tofree;
@@ -1970,6 +1969,8 @@ Messaging_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 #ifdef FEAT_AUTOCMD
                else if (data->dwData == COPYDATA_REPLY)
                {
+                   char_u      winstr[30];
+
                    sprintf((char *)winstr, PRINTF_HEX_LONG_U, (long_u)sender);
                    apply_autocmds(EVENT_REMOTEREPLY, winstr, str,
                                                                TRUE, curbuf);

diff --git a/src/version.c b/src/version.c
index 3374e16f5e22f3345680611ff86fa4e4c1e6f6b4..cc99dbc99afd144e7903e64d2b47adb2c5303954 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1208,
 /**/
     1207,
 /**/