Mercurial > hg > xemacs-beta
diff src/keymap.c @ 5183:f283b08ff0c9
Avoid build failure, Apple's g++-4.0.1, Mac OS 10.4.
2010-04-02 Aidan Kehoe <kehoea@parhasard.net>
Avoid build failure, Apple's g++-4.0.1, Mac OS 10.4.
* sysdll.c (search_linked_libs, dll_variable): Correct some casts
for the C++ build.
* regex.h (END_C_DECLS, BEGIN_C_DECLS): Wrap function declarations
in extern "C" { ... } on the C++ build.
* mule-ccl.c (ccl_driver): Initialise i, silencing a warning on
a C++ build.
* keymap.c (key_desc_list_to_event):
Work around a bug in Apple's g++-4.0.1.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Fri, 02 Apr 2010 12:21:02 +0100 |
| parents | 2e528066e2fc |
| children | 71ee43b8a74d |
line wrap: on
line diff
--- a/src/keymap.c Thu Apr 01 20:22:50 2010 +0100 +++ b/src/keymap.c Fri Apr 02 12:21:02 2010 +0100 @@ -1528,7 +1528,13 @@ define_key_parser (list, &raw_key); - if ( + /* The first zero is needed for Apple's i686-apple-darwin8-g++-4.0.1, + otherwise the build fails with: + + In function ‘void key_desc_list_to_event(Lisp_Object, Lisp_Object, int)’: + cc1plus: error: expected primary-expression + cc1plus: error: expected `)' */ + if (0 || #define INCLUDE_BUTTON_ZERO #define FROB(num) \ EQ (raw_key.keysym, Qbutton##num) || \