patch 7.4.1476

Problem:    Function arguments marked as unused while they are not.
Solution:   Remove UNUSED. (Yegappan Lakshmanan)

diff --git a/src/diff.c b/src/diff.c
index be7e38ccbeaf8abb6962082f0bb228433b3f997c..92e1a054e70bae7d9c7a6d8a2b52ee14982f2caa 100644 (file)
--- a/src/diff.c
+++ b/src/diff.c
@@ -641,7 +641,7 @@ diff_write(buf_T *buf, char_u *fname)
  */
     void
 ex_diffupdate(
-    exarg_T    *eap UNUSED)        /* can be NULL */
+    exarg_T    *eap)       /* can be NULL */
 {
     buf_T      *buf;
     int                idx_orig;

diff --git a/src/eval.c b/src/eval.c
index 794ff685bf4f5676985a1f3e07079739c33236e3..faed315e6b87ca90214d8125843c0089ac7811ae 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -9217,7 +9217,7 @@ f_argidx(typval_T *argvars UNUSED, typval_T *rettv)
  * "arglistid()" function
  */
     static void
-f_arglistid(typval_T *argvars UNUSED, typval_T *rettv)
+f_arglistid(typval_T *argvars, typval_T *rettv)
 {
     win_T      *wp;
 
@@ -17782,7 +17782,7 @@ f_round(typval_T *argvars, typval_T *rettv)
  * "screenattr()" function
  */
     static void
-f_screenattr(typval_T *argvars UNUSED, typval_T *rettv)
+f_screenattr(typval_T *argvars, typval_T *rettv)
 {
     int                row;
     int                col;
@@ -17802,7 +17802,7 @@ f_screenattr(typval_T *argvars UNUSED, typval_T *rettv)
  * "screenchar()" function
  */
     static void
-f_screenchar(typval_T *argvars UNUSED, typval_T *rettv)
+f_screenchar(typval_T *argvars, typval_T *rettv)
 {
     int                row;
     int                col;
@@ -20969,7 +20969,7 @@ f_virtcol(typval_T *argvars, typval_T *rettv)
  * "visualmode()" function
  */
     static void
-f_visualmode(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
+f_visualmode(typval_T *argvars, typval_T *rettv)
 {
     char_u     str[2];
 

diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index 88257ccddd732cb0cb55b27e52371cbb24c8f4f1..e1a0dfd11e9fe27d79fe4164b8a034a568aeeb08 100644 (file)
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -2033,7 +2033,7 @@ set_arglist(char_u *str)
     static int
 do_arglist(
     char_u     *str,
-    int                what UNUSED,
+    int                what,
     int                after UNUSED)           /* 0 means before first one */
 {
     garray_T   new_ga;

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 9900c1b6de919715bc8551270c3a482dca06fa95..4aa7f5df736638c6b76c4255b64e1b87fae95e15 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -9262,7 +9262,7 @@ ex_bang(exarg_T *eap)
  * ":undo".
  */
     static void
-ex_undo(exarg_T *eap UNUSED)
+ex_undo(exarg_T *eap)
 {
     if (eap->addr_count == 1)      /* :undo 123 */
        undo_time(eap->line2, FALSE, FALSE, TRUE);
@@ -9759,7 +9759,7 @@ theend:
 #if ((defined(FEAT_SESSION) || defined(FEAT_EVAL)) && defined(vim_mkdir)) \
        || defined(PROTO)
     int
-vim_mkdir_emsg(char_u *name, int prot UNUSED)
+vim_mkdir_emsg(char_u *name, int prot)
 {
     if (vim_mkdir(name, prot) != 0)
     {

diff --git a/src/version.c b/src/version.c
index 3491a4bad4e52660b81680f3955854df5ebc6bc5..c11af3f6693625692ffb9fd27452d1fb4158cb01 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1476,
 /**/
     1475,
 /**/

diff --git a/src/window.c b/src/window.c
index ee69921ff97bd722379ff628754150847a2a2981..7dfbe5a991e2e0c375b251d52d9e6c4701e86198 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -3896,8 +3896,8 @@ leave_tabpage(
 enter_tabpage(
     tabpage_T  *tp,
     buf_T      *old_curbuf UNUSED,
-    int                trigger_enter_autocmds UNUSED,
-    int                trigger_leave_autocmds UNUSED)
+    int                trigger_enter_autocmds,
+    int                trigger_leave_autocmds)
 {
     int                old_off = tp->tp_firstwin->w_winrow;
     win_T      *next_prevwin = tp->tp_prevwin;