Mercurial > hg > xemacs-beta
comparison src/sysdll.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 | 4aebb0131297 |
| children | 3889ef128488 308d34e9f07d |
comparison
equal
deleted
inserted
replaced
| 5182:2e528066e2fc | 5183:f283b08ff0c9 |
|---|---|
| 366 if ((LC_LOAD_DYLIB == lc->cmd) || (LC_LOAD_WEAK_DYLIB == lc->cmd)) | 366 if ((LC_LOAD_DYLIB == lc->cmd) || (LC_LOAD_WEAK_DYLIB == lc->cmd)) |
| 367 { | 367 { |
| 368 struct mach_header *wh; | 368 struct mach_header *wh; |
| 369 | 369 |
| 370 if ((wh = (struct mach_header *) | 370 if ((wh = (struct mach_header *) |
| 371 my_find_image((Rawbyte *) | 371 my_find_image((const Chbyte *) |
| 372 (((struct dylib_command *) lc)-> | 372 (((struct dylib_command *) lc)-> |
| 373 dylib.name.offset + (Rawbyte *) lc)))) | 373 dylib.name.offset + (const Chbyte *) lc)))) |
| 374 { | 374 { |
| 375 Extbyte *symext = | 375 Extbyte *symext = |
| 376 ITEXT_TO_EXTERNAL (symbol, Qdll_symbol_encoding); | 376 ITEXT_TO_EXTERNAL (symbol, Qdll_symbol_encoding); |
| 377 if (NSIsSymbolNameDefinedInImage (wh, symext)) | 377 if (NSIsSymbolNameDefinedInImage (wh, symext)) |
| 378 { | 378 { |
| 440 Extbyte *next; | 440 Extbyte *next; |
| 441 | 441 |
| 442 MAYBE_PREPEND_UNDERSCORE (n); | 442 MAYBE_PREPEND_UNDERSCORE (n); |
| 443 next = ITEXT_TO_EXTERNAL (n, Qdll_variable_name_encoding); | 443 next = ITEXT_TO_EXTERNAL (n, Qdll_variable_name_encoding); |
| 444 | 444 |
| 445 sym = NSLookupSymbolInModule ((NSModule) h, n); | 445 sym = NSLookupSymbolInModule ((NSModule) h, (const Chbyte *)n); |
| 446 if (sym == 0) return 0; | 446 if (sym == 0) return 0; |
| 447 return (dll_var) NSAddressOfSymbol (sym); | 447 return (dll_var) NSAddressOfSymbol (sym); |
| 448 } | 448 } |
| 449 | 449 |
| 450 Lisp_Object | 450 Lisp_Object |