Merge branch 'master' into xwidget

[gnu-emacs] / src / lisp.h

diff --git a/src/lisp.h b/src/lisp.h
index a1ea35574c355ee3781bc1339c54b76ce76010e5..f1e6945f43abf270094db42c7d01f2854ad98b8f 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -781,6 +781,11 @@ enum pvec_type
   PVEC_WINDOW_CONFIGURATION,
   PVEC_SUBR,
   PVEC_OTHER,
+#ifdef HAVE_XWIDGETS
+  PVEC_XWIDGET,
+  PVEC_XWIDGET_VIEW,
+#endif
+
   /* These should be last, check internal_equal to see why.  */
   PVEC_COMPILED,
   PVEC_CHAR_TABLE,
@@ -1508,13 +1513,13 @@ gc_aset (Lisp_Object array, ptrdiff_t idx, Lisp_Object val)
    to find such assumptions later if we change Qnil to be nonzero.  */
 enum { NIL_IS_ZERO = XLI_BUILTIN_LISPSYM (iQnil) == 0 };
 
-/* Set a Lisp_Object array V's SIZE entries to nil.  */
+/* Set a Lisp_Object array V's N entries to nil.  */
 INLINE void
-memsetnil (Lisp_Object *v, ptrdiff_t size)
+memsetnil (Lisp_Object *v, ptrdiff_t n)
 {
-  eassert (0 <= size);
+  eassert (0 <= n);
   verify (NIL_IS_ZERO);
-  memset (v, 0, size * sizeof *v);
+  memset (v, 0, n * sizeof *v);
 }
 
 /* If a struct is made to look like a vector, this macro returns the length