From a7f752540226e033c061be107a623a0563f68031 Mon Sep 17 00:00:00 2001
From: Kaz Kylheku <kaz@kylheku.com>
Date: Tue, 27 Oct 2015 06:51:51 -0700
Subject: Fix C++ clash in slots implementation.

* struct.c (make_struct_type): Don't use nullptr identifier
as variable name.
---
 struct.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'struct.c')

diff --git a/struct.c b/struct.c
index 24d65363..040b43be 100644
--- a/struct.c
+++ b/struct.c
@@ -224,7 +224,7 @@ val make_struct_type(val name, val super,
     val id = num_fast(++struct_id_counter);
     val iter;
     cnum sl, stsl;
-    val nullptr = 0;
+    val null_ptr = 0;
 
     st->name = name;
     st->id = c_num(id);
@@ -262,7 +262,7 @@ val make_struct_type(val name, val super,
 
     stsl -= STATIC_SLOT_BASE;
     st->stslot = coerce(val *, chk_manage_vec(0, 0, stsl, sizeof (val),
-                                              coerce(mem_t *, &nullptr)));
+                                              coerce(mem_t *, &null_ptr)));
     st->nslots = sl;
     st->nstslots = stsl;
 
-- 
cgit v1.2.3