Mercurial > hg > xemacs-beta

diff src/fontcolor-msw.c @ 5256:6c8f5574d4a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix the C++, Visual Studio 2005 builds. src/ChangeLog addition: 2010-09-03 Aidan Kehoe <kehoea@parhasard.net> * 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.
author Aidan Kehoe <kehoea@parhasard.net>
date Fri, 03 Sep 2010 15:35:53 +0100
parents ec2ddc82f10d
children 94bbd4792049 308d34e9f07d
line wrap: on
line diff
--- 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;
         }