Avoid relying on symbol re-mapping.

git-svn-id: https://svn.r-project.org/R/trunk@87319 00db46b3-68df-0310-9c12-caf00c1e9a41

Author: kalibera

src/gnuwin32/dos_wglob.c

@@ -818,7 +818,7 @@ globextend(const wchar_t *path, wglob_t *pglob, size_t *limitp)
 	pathv = R_Calloc(newsize, wchar_t *);
     if (pathv == NULL) {
 	if (pglob->gl_pathv) {
-	    Free(pglob->gl_pathv);
+	    R_Free(pglob->gl_pathv);
 	    pglob->gl_pathv = NULL;
 	}
 	return(GLOB_NOSPACE);
@@ -924,8 +924,8 @@ dos_wglobfree(wglob_t *pglob)
 	pp = pglob->gl_pathv + pglob->gl_offs;
 	for (i = pglob->gl_pathc; i--; ++pp)
 	    if (*pp)
-		Free(*pp);
-	Free(pglob->gl_pathv);
+		R_Free(*pp);
+	R_Free(pglob->gl_pathv);
 	pglob->gl_pathv = NULL;
     }
 }

src/library/utils/src/windows/dialogs.c

@@ -3,7 +3,7 @@
  *  file dialogs.c
  *  Copyright (C) 1998--2003  Guido Masarotto and Brian Ripley
  *  Copyright (C) 2004	      The R Foundation
- *  Copyright (C) 2005--2023  The R Core Team
+ *  Copyright (C) 2005--2024  The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -54,7 +54,7 @@ static void pbarFinalizer(SEXP ptr)
     if(pbar-> lab) del(pbar->lab);
     del(pbar->pb);
     del(pbar->wprog);
-    Free(pbar);
+    R_Free(pbar);
     R_ClearExternalPtr(ptr); /* not really needed */
 }