Mercurial > hg > xemacs-beta
changeset 5055:79564cbad5f3
Simplify assertion in events.c so it will build under Visual Studio 6
| author | Vin Shelton <acs@xemacs.org> |
|---|---|
| date | Sun, 21 Feb 2010 23:20:44 -0500 |
| parents | 24372c7e0e8f |
| children | 742b7a124d6c fef9572ebdb1 |
| files | src/ChangeLog src/events.c |
| diffstat | 2 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Feb 21 20:58:45 2010 -0600 +++ b/src/ChangeLog Sun Feb 21 23:20:44 2010 -0500 @@ -1,3 +1,8 @@ +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 Sun Feb 21 20:58:45 2010 -0600 +++ b/src/events.c Sun Feb 21 23:20:44 2010 -0500 @@ -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)