From ebadbfa6e794fbd089b9f21dc82519b0816f5c02 Mon Sep 17 00:00:00 2001 From: Adrian Robert Date: Fri, 1 Aug 2008 15:33:15 +0000 Subject: [PATCH] commit patch to x-load-color-file posted by lekktu@gmail.com --- src/ChangeLog | 5 +++++ src/xfaces.c | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 19877ab731..0e7c4b9a88 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2008-08-01 Juanma Barranquero + + * xfaces.c (x-load-color-file): Use RGB() instead of manually shifting + on Windows. + 2008-08-01 Adrian Robert Warning clearing and clean-up in NS port. diff --git a/src/xfaces.c b/src/xfaces.c index 4d49d9a8f7..e2d2ec652c 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -6600,7 +6600,11 @@ where R,G,B are numbers between 0 and 255 and name is an arbitrary string. */) if (name[num] == '\n') name[num] = 0; cmap = Fcons (Fcons (build_string (name), - make_number ((red << 16) | (green << 8) | blue)), +#ifdef WINDOWS_NT + make_number (RGB (red, green, blue))), +#else + make_number ((red << 16) | (green << 8) | blue)), +#endif cmap); } } -- 2.20.1