Mercurial > hg > xemacs-beta
changeset 5063:fef9572ebdb1
merge
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Mon, 22 Feb 2010 06:58:20 -0600 |
| parents | 151d425f8ef0 (current diff) 79564cbad5f3 (diff) |
| children | 501b5e84f5a7 |
| files | src/ChangeLog |
| diffstat | 2 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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)