X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Frendercolor.cc;h=7a0b5fcc4fcbb0c0c32ae9338791e341709f8d51;hb=6b1381d69daf7c325d4a8165a8b0006d0dce85a5;hp=be9521bf5fded0bd44c9f8b95e8897a15b9d0967;hpb=ff3bb7566b76ff28e72e64054908145854b4454d;p=chaz%2Fopenbox

diff --git a/otk/rendercolor.cc b/otk/rendercolor.cc
index be9521bf..7a0b5fcc 100644
--- a/otk/rendercolor.cc
+++ b/otk/rendercolor.cc
@@ -1,18 +1,12 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
-#ifdef    HAVE_CONFIG_H
-#  include "../config.h"
-#endif // HAVE_CONFIG_H
+#include "config.h"
 
 #include "rendercolor.hh"
 #include "display.hh"
 #include "screeninfo.hh"
 
-extern "C" {
-#ifdef HAVE_STDIO_H
-#  include <stdio.h>
-#endif
-}
+#include <cstdio>
 
 namespace otk {
 
@@ -67,9 +61,9 @@ void RenderColor::create()
     const ScreenInfo *info = display->screenInfo(_screen);
 
     XColor xcol;    // convert from 0-0xff to 0-0xffff
-    xcol.red = _red; xcol.red |= xcol.red << 8;
-    xcol.green = _green; xcol.green |= xcol.green << 8;
-    xcol.blue = _blue; xcol.blue |= xcol.blue << 8;
+    xcol.red = (_red << 8) | _red;
+    xcol.green = (_green << 8) | _green;
+    xcol.blue = (_blue << 8) | _blue;
     xcol.pixel = 0;
 
     if (! XAllocColor(**display, info->colormap(), &xcol)) {