APPROVE COMMIT NOTE: This patch has been committed. # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net&gt; # Date 1283524553 -3600 # Node ID 6c8f5574d4a16620ba5f97eac7e377d8fc0f79ae # Parent b5611afbcc76ccadea91257e34d9c609632c1750 Fix the C++, Visual Studio 2005 builds. src/ChangeLog addition: 2010-09-03 Aidan Kehoe <kehoea(a)parhasard.net&gt; * symsinit.h: Declare reinit_process_early() here, fixing the C++ build; thank you for pointing this out, Adam Sjogren! * fontcolor-msw.c (mswindows_string_to_color): Cast the result of bsearch() to a colormap_t pointer, fixing the Visual Studio 2005 build. diff -r b5611afbcc76 -r 6c8f5574d4a1 src/ChangeLog --- a/src/ChangeLog Thu Sep 02 12:23:11 2010 +0100 +++ b/src/ChangeLog Fri Sep 03 15:35:53 2010 +0100 ＠＠ -1,3 +1,11 ＠＠ +2010-09-03 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * symsinit.h: Declare reinit_process_early() here, fixing the C++ + build; thank you for pointing this out, Adam Sjøgren! + * fontcolor-msw.c (mswindows_string_to_color): + Cast the result of bsearch() to a colormap_t pointer, fixing the + Visual Studio 2005 build. + 2010-09-02 Aidan Kehoe <kehoea(a)parhasard.net&gt; * strftime.c (roman_upper, roman_lower, strftime): diff -r b5611afbcc76 -r 6c8f5574d4a1 src/fontcolor-msw.c --- a/src/fontcolor-msw.c Thu Sep 02 12:23:11 2010 +0100 +++ b/src/fontcolor-msw.c Fri Sep 03 15:35:53 2010 +0100 ＠＠ -1022,10 +1022,10 ＠＠ } *c = '\0'; - if ((res = bsearch (&key, mswindows_X_color_map, - countof (mswindows_X_color_map), - sizeof (mswindows_X_color_map[0]), - colormap_t_compare)) != NULL) + if ((res = (colormap_t *) bsearch (&key, mswindows_X_color_map, + countof (mswindows_X_color_map), + sizeof (mswindows_X_color_map[0]), + colormap_t_compare)) != NULL) { return res->colorref; } diff -r b5611afbcc76 -r 6c8f5574d4a1 src/symsinit.h --- a/src/symsinit.h Thu Sep 02 12:23:11 2010 +0100 +++ b/src/symsinit.h Fri Sep 03 15:35:53 2010 +0100 ＠＠ -54,6 +54,7 ＠＠ void init_errors_once_early (void); void reinit_opaque_early (void); void init_opaque_once_early (void); +void reinit_process_early (void); void reinit_symbols_early (void); void init_symbols_once_early (void); -- “Apart from the nine-banded armadillo, man is the only natural host of Mycobacterium leprae, although it can be grown in the footpads of mice.” -- Kumar & Clark, Clinical Medicine, summarising improbable leprosy research _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/mailman/listinfo/xemacs-patches