# HG changeset patch
# User Ben Wing <ben@xemacs.org>
# Date 1266843500 21600
# Node ID fef9572ebdb1c295c3f23ad49e1dc5ae658b323b
# Parent  151d425f8ef0e07000af4b8fe74c59d4de9bb396# Parent  79564cbad5f3d095cd183b4b761f6d5144f8416d
merge

diff -r 151d425f8ef0 -r fef9572ebdb1 src/ChangeLog
--- a/src/ChangeLog	Mon Feb 22 06:56:35 2010 -0600
+++ b/src/ChangeLog	Mon Feb 22 06:58:20 2010 -0600
@@ -57,6 +57,11 @@
 	* alloc.c (object_memory_usage_stats):
 	Clean up duplication.
 
+2010-02-21  Vin Shelton  <acs@xemacs.org>
+
+	* events.c (event_pixel_translation): Simplify assertion for
+	Visual C 6.
+
 2010-02-21  Ben Wing  <ben@xemacs.org>
 
 	* gc.c (kkcc_marking): Fix compile error.
diff -r 151d425f8ef0 -r fef9572ebdb1 src/events.c
--- a/src/events.c	Mon Feb 22 06:56:35 2010 -0600
+++ b/src/events.c	Mon Feb 22 06:58:20 2010 -0600
@@ -2134,11 +2134,12 @@
      pointer points to random memory, often filled with 0, sometimes not.
    */
   /* #### Chuck, do we still need this crap? */
+#ifdef HAVE_TOOLBARS
   assert (NILP (ret_obj1) || GLYPHP (ret_obj1)
-#ifdef HAVE_TOOLBARS
-	  || TOOLBAR_BUTTONP (ret_obj1)
+	  || TOOLBAR_BUTTONP (ret_obj1));
+#else
+  assert (NILP (ret_obj1) || GLYPHP (ret_obj1));
 #endif
-	  );
   assert (NILP (ret_obj2) || EXTENTP (ret_obj2) || CONSP (ret_obj2));
 
   if (char_x)