Mercurial > hg > xemacs-beta
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 5182:2e528066e2fc | 5183:f283b08ff0c9 |
|---|---|
| 1526 return; | 1526 return; |
| 1527 } | 1527 } |
| 1528 | 1528 |
| 1529 define_key_parser (list, &raw_key); | 1529 define_key_parser (list, &raw_key); |
| 1530 | 1530 |
| 1531 if ( | 1531 /* The first zero is needed for Apple's i686-apple-darwin8-g++-4.0.1, |
| 1532 otherwise the build fails with: | |
| 1533 | |
| 1534 In function ‘void key_desc_list_to_event(Lisp_Object, Lisp_Object, int)’: | |
| 1535 cc1plus: error: expected primary-expression | |
| 1536 cc1plus: error: expected `)' */ | |
| 1537 if (0 || | |
| 1532 #define INCLUDE_BUTTON_ZERO | 1538 #define INCLUDE_BUTTON_ZERO |
| 1533 #define FROB(num) \ | 1539 #define FROB(num) \ |
| 1534 EQ (raw_key.keysym, Qbutton##num) || \ | 1540 EQ (raw_key.keysym, Qbutton##num) || \ |
| 1535 EQ (raw_key.keysym, Qbutton##num##up) || | 1541 EQ (raw_key.keysym, Qbutton##num##up) || |
| 1536 #include "keymap-buttons.h" | 1542 #include "keymap-buttons.h" |