Lock base environment and its namespace.

git-svn-id: https://svn.r-project.org/R/trunk@80163 00db46b3-68df-0310-9c12-caf00c1e9a41
wch · Apr 13, 2021 · 26165fd · 26165fd
1 parent 7d92421
commit 26165fd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/envir.c b/src/main/envir.c
@@ -3289,7 +3289,7 @@ void R_LockEnvironment(SEXP env, Rboolean bindings)
 		    if(SYMVALUE(CAR(s)) != R_UnboundValue)
 			LOCK_BINDING(CAR(s));
 	}
-#ifdef NOT_YET
+#ifndef NOT_YET
 	/* causes problems with Matrix */
 	LOCK_FRAME(env);
 #endif

diff --git a/src/main/main.c b/src/main/main.c
@@ -961,7 +961,7 @@ void setup_Rmainloop(void)
     R_LoadProfile(R_OpenSysInitFile(), baseEnv);
     /* These are the same bindings, so only lock them once */
     R_LockEnvironment(R_BaseNamespace, TRUE);
-#ifdef NOTYET
+#ifndef NOTYET
     /* methods package needs to trample here */
     R_LockEnvironment(R_BaseEnv, TRUE);
 #endif