* nsfns.m: Fix GLYPH_DEBUG usage assuming that it may be

undefined.  Convert from xassert to eassert.
* nsmenu.m: Convert from xassert to eassert.
* nsterm.m: Likewise.

src/ChangeLog

+2012-06-29  Dmitry Antipov  <dmantipov@yandex.ru>
+
+	* nsfns.m: Fix GLYPH_DEBUG usage assuming that it may be
+	undefined.  Convert from xassert to eassert.
+	* nsmenu.m: Convert from xassert to eassert.
+	* nsterm.m: Likewise.
+
 2012-06-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* editfns.c (region_limit): Clip to narrowing (bug#11770).

src/nsfns.m

@@ -101,7 +101,7 @@ Updated by Christian Limpach (chris@nice.ch)
 static Lisp_Object as_script, *as_result;
 static int as_status;
 
-#if GLYPH_DEBUG
+#ifdef GLYPH_DEBUG
 static ptrdiff_t image_cache_refcount;
 #endif
 
@@ -1058,16 +1058,16 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
   /* If frame is ``official'', nothing to do.  */
   if (NILP (Fmemq (frame, Vframe_list)))
     {
-#if GLYPH_DEBUG && XASSERTS
+#if defined GLYPH_DEBUG && defined ENABLE_CHECKING
       struct ns_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
 #endif
 
       x_free_frame_resources (f);
       free_glyphs (f);
 
-#if GLYPH_DEBUG
+#ifdef GLYPH_DEBUG
       /* Check that reference counts are indeed correct.  */
-      xassert (dpyinfo->terminal->image_cache->refcount == image_cache_refcount);
+      eassert (dpyinfo->terminal->image_cache->refcount == image_cache_refcount);
 #endif
       return Qt;
     }
@@ -1294,7 +1294,7 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
   x_default_parameter (f, parms, Qright_fringe, Qnil,
 		       "rightFringe", "RightFringe", RES_TYPE_NUMBER);
 
-#if GLYPH_DEBUG
+#ifdef GLYPH_DEBUG
   image_cache_refcount =
     FRAME_IMAGE_CACHE (f) ? FRAME_IMAGE_CACHE (f)->refcount : 0;
 #endif

src/nsmenu.m

@@ -1057,7 +1057,7 @@ - (Lisp_Object)runMenuAt: (NSPoint)p forFrame: (struct frame *)f
 	{
           /* NS toolbar auto-computes disabled and selected images */
           idx = TOOL_BAR_IMAGE_ENABLED_SELECTED;
-	  xassert (ASIZE (image) >= idx);
+	  eassert (ASIZE (image) >= idx);
 	  image = AREF (image, idx);
 	}
       else

src/nsterm.m

@@ -2108,7 +2108,7 @@ Free a pool and temporary objects it refers to (callable from C)
   NSTRACE (ns_after_update_window_line);
 
   /* begin copy from other terms */
-  xassert (w);
+  eassert (w);
 
   if (!desired_row->mode_line_p && !w->pseudo_window_p)
     desired_row->redraw_fringe_bitmaps_p = 1;