* 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.

diff --git a/src/ChangeLog b/src/ChangeLog
index 241658ac33aa625cfa2fdf32b54597cd18628970..b7a1da9cd573d2f97baa9ee0b6f59488d8ada4d9 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+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).

diff --git a/src/nsfns.m b/src/nsfns.m
index 113fff394c432be5856e6ffaf2c04f0337eb5aa6..cd943ac4baba87522764dda950804da3af357930 100644 (file)
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -101,7 +101,7 @@ extern BOOL ns_in_resize;
 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 @@ unwind_create_frame (Lisp_Object frame)
   /* 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 @@ This function is an internal primitive--use `make-frame' instead.  */)
   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

diff --git a/src/nsmenu.m b/src/nsmenu.m
index 1f86417b53ad67e7fff2f3f3349b6eecd05caab0..9d74337580a1d58099d852cbd23370847747f49c 100644 (file)
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -1057,7 +1057,7 @@ update_frame_tool_bar (FRAME_PTR 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

diff --git a/src/nsterm.m b/src/nsterm.m
index bf14e5c83b12f47867763295f3f12eac03d79924..c75b17135efc1657ba3715bdbb8d0ddb8e939abe 100644 (file)
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -2108,7 +2108,7 @@ ns_after_update_window_line (struct glyph_row *desired_row)
   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;