about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2018-06-12T14·16+0200
committerEelco Dolstra <edolstra@gmail.com>2018-06-12T15·49+0200
commitc905d8b0a84877d3cab10d4a8b8ad81895a6500e (patch)
tree032ad5ec6ca98b2a904892b979a7c252e3d3e4c7
parent455d1f01d041baf58abc3c9baf5e59ee054d9c9b (diff)
GC_malloc -> GC_MALLOC
This makes it possible to build with -DGC_DEBUG.
-rw-r--r--src/libexpr/eval-inline.hh2
-rw-r--r--src/libexpr/eval.cc10
2 files changed, 3 insertions, 9 deletions
diff --git a/src/libexpr/eval-inline.hh b/src/libexpr/eval-inline.hh
index ad172c37c7b9..c27116e3b448 100644
--- a/src/libexpr/eval-inline.hh
+++ b/src/libexpr/eval-inline.hh
@@ -83,7 +83,7 @@ inline void * allocBytes(size_t n)
 {
     void * p;
 #if HAVE_BOEHMGC
-    p = GC_malloc(n);
+    p = GC_MALLOC(n);
 #else
     p = calloc(n, 1);
 #endif
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index 113850bff1f9..e09297546c95 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -21,12 +21,6 @@
 #include <gc/gc.h>
 #include <gc/gc_cpp.h>
 
-#define NEW new (UseGC)
-
-#else
-
-#define NEW new
-
 #endif
 
 
@@ -37,7 +31,7 @@ static char * dupString(const char * s)
 {
     char * t;
 #if HAVE_BOEHMGC
-    t = GC_strdup(s);
+    t = GC_STRDUP(s);
 #else
     t = strdup(s);
 #endif
@@ -446,7 +440,7 @@ Value * EvalState::addPrimOp(const string & name,
     string name2 = string(name, 0, 2) == "__" ? string(name, 2) : name;
     Symbol sym = symbols.create(name2);
     v->type = tPrimOp;
-    v->primOp = NEW PrimOp(primOp, arity, sym);
+    v->primOp = new PrimOp(primOp, arity, sym);
     staticBaseEnv.vars[symbols.create(name)] = baseEnvDispl;
     baseEnv.values[baseEnvDispl++] = v;
     baseEnv.values[0]->attrs->push_back(Attr(sym, v));