diff options
author | Bram Moolenaar <Bram@vim.org> | 2008-03-16 15:04:34 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2008-03-16 15:04:34 +0000 |
commit | cb4cef2206b19e5d8737580eee29b44f45cb7de1 (patch) | |
tree | b1b913a81d81e668f2c33ba5fde0de5255cdae6a /src | |
parent | 0fde290e55feb8f3505c790c8ce9b5302893dfae (diff) |
updated for version 7.1-283v7.1.283
Diffstat (limited to 'src')
-rw-r--r-- | src/ex_docmd.c | 2 | ||||
-rw-r--r-- | src/globals.h | 2 | ||||
-rw-r--r-- | src/if_cscope.c | 2 | ||||
-rw-r--r-- | src/main.c | 8 | ||||
-rw-r--r-- | src/mark.c | 2 | ||||
-rw-r--r-- | src/netbeans.c | 6 | ||||
-rw-r--r-- | src/popupmnu.c | 2 | ||||
-rw-r--r-- | src/version.c | 2 | ||||
-rw-r--r-- | src/vim.h | 19 | ||||
-rw-r--r-- | src/window.c | 2 |
10 files changed, 26 insertions, 21 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 193796f474..71a7b1bb9c 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -3009,7 +3009,7 @@ modifier_len(cmd) break; if (!isalpha(p[j]) && j >= cmdmods[i].minlen && (p == cmd || cmdmods[i].has_count)) - return j + (p - cmd); + return j + (int)(p - cmd); } return 0; } diff --git a/src/globals.h b/src/globals.h index a77f14b07d..469801bb80 100644 --- a/src/globals.h +++ b/src/globals.h @@ -1263,7 +1263,7 @@ EXTERN int echo_wid_arg INIT(= FALSE); /* --echo-wid argument */ * The value of the --windowid argument. * For embedding gvim inside another application. */ -EXTERN int win_socket_id INIT(= 0); +EXTERN long_u win_socket_id INIT(= 0); #endif #if defined(FEAT_CLIENTSERVER) || defined(FEAT_EVAL) diff --git a/src/if_cscope.c b/src/if_cscope.c index e76b58dd7f..b2d39cf42d 100644 --- a/src/if_cscope.c +++ b/src/if_cscope.c @@ -1400,7 +1400,7 @@ cs_lookup_cmd(eap) return NULL; /* Store length of eap->arg before it gets modified by strtok(). */ - eap_arg_len = STRLEN(eap->arg); + eap_arg_len = (int)STRLEN(eap->arg); if ((stok = strtok((char *)(eap->arg), (const char *)" ")) == NULL) return NULL; diff --git a/src/main.c b/src/main.c index 07390a9327..2a02615f43 100644 --- a/src/main.c +++ b/src/main.c @@ -1552,15 +1552,15 @@ early_arg_scan(parmp) else if (STRICMP(argv[i], "--socketid") == 0) # endif { - unsigned int id; - int count; + long_u id; + int count; if (i == argc - 1) mainerr_arg_missing((char_u *)argv[i]); if (STRNICMP(argv[i+1], "0x", 2) == 0) - count = sscanf(&(argv[i + 1][2]), "%x", &id); + count = sscanf(&(argv[i + 1][2]), SCANF_HEX_LONG_U, &id); else - count = sscanf(argv[i+1], "%u", &id); + count = sscanf(argv[i + 1], SCANF_DECIMAL_LONG_U, &id); if (count != 1) mainerr(ME_INVALID_ARG, (char_u *)argv[i]); else diff --git a/src/mark.c b/src/mark.c index 2accbba1fb..7428969860 100644 --- a/src/mark.c +++ b/src/mark.c @@ -522,7 +522,7 @@ fname2fnum(fm) int len; expand_env((char_u *)"~/", NameBuff, MAXPATHL); - len = STRLEN(NameBuff); + len = (int)STRLEN(NameBuff); vim_strncpy(NameBuff + len, fm->fname + 2, MAXPATHL - len - 1); } else diff --git a/src/netbeans.c b/src/netbeans.c index e3e32008e9..ed415a5ccb 100644 --- a/src/netbeans.c +++ b/src/netbeans.c @@ -1216,7 +1216,7 @@ nb_partialremove(linenr_T lnum, colnr_T first, colnr_T last) int lastbyte = last; oldtext = ml_get(lnum); - oldlen = STRLEN(oldtext); + oldlen = (int)STRLEN(oldtext); if (first >= (colnr_T)oldlen || oldlen == 0) /* just in case */ return; if (lastbyte >= oldlen) @@ -1241,8 +1241,8 @@ nb_joinlines(linenr_T first, linenr_T other) int len_first, len_other; char_u *p; - len_first = STRLEN(ml_get(first)); - len_other = STRLEN(ml_get(other)); + len_first = (int)STRLEN(ml_get(first)); + len_other = (int)STRLEN(ml_get(other)); p = alloc((unsigned)(len_first + len_other + 1)); if (p != NULL) { diff --git a/src/popupmnu.c b/src/popupmnu.c index 4dd3a94882..1d747a6bf3 100644 --- a/src/popupmnu.c +++ b/src/popupmnu.c @@ -337,7 +337,7 @@ pum_redraw() if (rt != NULL) { - len = STRLEN(rt); + len = (int)STRLEN(rt); if (len > pum_width) { for (j = pum_width; j < len; ++j) diff --git a/src/version.c b/src/version.c index 9e73bb989c..b811919558 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 283, +/**/ 282, /**/ 281, @@ -355,16 +355,19 @@ typedef unsigned int int_u; * On Win64 longs are 32 bit and pointers 64 bit. * For printf() and scanf() we need to take care of long_u specifically. */ #ifdef _WIN64 -typedef unsigned __int64 long_u; -typedef __int64 long_i; -# define SCANF_HEX_LONG_U "%Ix" -# define PRINTF_HEX_LONG_U "0x%Ix" +typedef unsigned __int64 long_u; +typedef __int64 long_i; +# define SCANF_HEX_LONG_U "%Ix" +# define SCANF_DECIMAL_LONG_U "%Iu" +# define PRINTF_HEX_LONG_U "0x%Ix" #else -typedef unsigned long long_u; -typedef long long_i; -# define SCANF_HEX_LONG_U "%lx" -# define PRINTF_HEX_LONG_U "0x%lx" +typedef unsigned long long_u; +typedef long long_i; +# define SCANF_HEX_LONG_U "%lx" +# define SCANF_DECIMAL_LONG_U "%lu" +# define PRINTF_HEX_LONG_U "0x%lx" #endif +#define PRINTF_DECIMAL_LONG_U SCANF_DECIMAL_LONG_U /* * The characters and attributes cached for the screen. diff --git a/src/window.c b/src/window.c index 74e3646872..584b9a4856 100644 --- a/src/window.c +++ b/src/window.c @@ -6303,7 +6303,7 @@ match_add(wp, grp, pat, prio, id) cur = cur->next; } } - if ((hlg_id = syn_namen2id(grp, STRLEN(grp))) == 0) + if ((hlg_id = syn_namen2id(grp, (int)STRLEN(grp))) == 0) { EMSG2(_(e_nogroup), grp); return -1; |