1 files changed, 20 insertions, 20 deletions

diff --git a/src/diff.c b/src/diff.c
index 880ae9edef..a93f1324fe 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -405,7 +405,7 @@ static void diff_mark_adjust_tp(tabpage_T *tp, int idx, linenr_T line1,
         }
       }
       dprev->df_next = dp->df_next;
-      vim_free(dp);
+      free(dp);
       dp = dprev->df_next;
     } else {
       // Advance to next entry.
@@ -428,7 +428,7 @@ static void diff_mark_adjust_tp(tabpage_T *tp, int idx, linenr_T line1,
 
     if (i == DB_COUNT) {
       diff_T *dnext = dp->df_next;
-      vim_free(dp);
+      free(dp);
       dp = dnext;
 
       if (dprev == NULL) {
@@ -543,7 +543,7 @@ static void diff_check_unchanged(tabpage_T *tp, diff_T *dp)
           break;
         }
       }
-      vim_free(line_org);
+      free(line_org);
 
       // Stop when a line isn't equal in all diff buffers.
       if (i_new != DB_COUNT) {
@@ -801,9 +801,9 @@ void ex_diffupdate(exarg_T *eap)
   diff_redraw(TRUE);
 
 theend:
-  vim_free(tmp_orig);
-  vim_free(tmp_new);
-  vim_free(tmp_diff);
+  free(tmp_orig);
+  free(tmp_new);
+  free(tmp_diff);
 }
 
 /// Make a diff between files "tmp_orig" and "tmp_new", results in "tmp_diff".
@@ -843,7 +843,7 @@ static void diff_file(char_u *tmp_orig, char_u *tmp_new, char_u *tmp_diff)
         NULL
         );
     unblock_autocmds();
-    vim_free(cmd);
+    free(cmd);
   }
 }
 
@@ -1010,16 +1010,16 @@ theend:
   if (tmp_orig != NULL) {
     os_remove((char *)tmp_orig);
   }
-  vim_free(tmp_orig);
+  free(tmp_orig);
 
   if (tmp_new != NULL) {
     os_remove((char *)tmp_new);
   }
-  vim_free(tmp_new);
-  vim_free(newname);
-  vim_free(buf);
+  free(tmp_new);
+  free(newname);
+  free(buf);
 #ifdef UNIX
-  vim_free(fullname);
+  free(fullname);
 #endif  // ifdef UNIX
 }
 
@@ -1362,7 +1362,7 @@ static void diff_read(int idx_orig, int idx_new, char_u *fname)
 
       while (dn != dp->df_next) {
         dpl = dn->df_next;
-        vim_free(dn);
+        free(dn);
         dn = dpl;
       }
     } else {
@@ -1429,7 +1429,7 @@ void diff_clear(tabpage_T *tp)
   diff_T *next_p;
   for (p = tp->tp_first_diff; p != NULL; p = next_p) {
     next_p = p->df_next;
-    vim_free(p);
+    free(p);
   }
   tp->tp_first_diff = NULL;
 }
@@ -1584,7 +1584,7 @@ static int diff_equal_entry(diff_T *dp, int idx1, int idx2)
     }
     int cmp = diff_cmp(line, ml_get_buf(curtab->tp_diffbuf[idx2],
                                         dp->df_lnum[idx2] + i, FALSE));
-    vim_free(line);
+    free(line);
 
     if (cmp != 0) {
       return FALSE;
@@ -1892,7 +1892,7 @@ int diff_find_change(win_T *wp, linenr_T lnum, int *startp, int *endp)
   int idx = diff_buf_idx(wp->w_buffer);
   if (idx == DB_COUNT) {
     // cannot happen
-    vim_free(line_org);
+    free(line_org);
     return FALSE;
   }
 
@@ -1905,7 +1905,7 @@ int diff_find_change(win_T *wp, linenr_T lnum, int *startp, int *endp)
   }
 
   if ((dp == NULL) || (diff_check_sanity(curtab, dp) == FAIL)) {
-    vim_free(line_org);
+    free(line_org);
     return FALSE;
   }
 
@@ -1985,7 +1985,7 @@ int diff_find_change(win_T *wp, linenr_T lnum, int *startp, int *endp)
     }
   }
 
-  vim_free(line_org);
+  free(line_org);
   return added;
 }
 
@@ -2284,7 +2284,7 @@ void ex_diffgetput(exarg_T *eap)
         p = vim_strsave(ml_get_buf(curtab->tp_diffbuf[idx_from], nr, FALSE));
         if (p != NULL) {
           ml_append(lnum + i - 1, p, 0, FALSE);
-          vim_free(p);
+          free(p);
           added++;
           if (buf_empty && (curbuf->b_ml.ml_line_count == 2)) {
             // Added the first line into an empty buffer, need to
@@ -2340,7 +2340,7 @@ void ex_diffgetput(exarg_T *eap)
       if (dfree != NULL) {
         // Diff is deleted, update folds in other windows.
         diff_fold_update(dfree, idx_to);
-        vim_free(dfree);
+        free(dfree);
       } else {
         // mark_adjust() may have changed the count in a wrong way
         dp->df_count[idx_to] = new_count;