From 418367589556790e6fb2b2a9cadf62b1408a87c9 Mon Sep 17 00:00:00 2001
From: Rene Gollent <anevilyak@gmail.com>
Date: Fri, 2 Mar 2012 20:39:12 -0500
Subject: [PATCH] Move black/white color constant definitions to header.

Previously, there were two instances of the actual variables, named in
ControlLook.cpp and Utilities.cpp. This caused clashes on gcc4 builds, leading
to various crashes during initialization. Instead we now declare them as
static constants in the header itself as is done for various other interface
color constants elsewhere. Fixes ticket #8358.
---
 src/kits/interface/ControlLook.cpp | 2 --
 src/kits/tracker/Utilities.cpp     | 3 ---
 src/kits/tracker/Utilities.h       | 4 ++--
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/kits/interface/ControlLook.cpp b/src/kits/interface/ControlLook.cpp
index fa1d1f3618..8a123fc1a3 100644
--- a/src/kits/interface/ControlLook.cpp
+++ b/src/kits/interface/ControlLook.cpp
@@ -22,8 +22,6 @@ namespace BPrivate {
 
 static const float kEdgeBevelLightTint = 0.59;
 static const float kEdgeBevelShadowTint = 1.0735;
-const rgb_color kWhite = (rgb_color){255, 255, 255, 255};
-const rgb_color kBlack = (rgb_color){0, 0, 0, 255};
 
 
 BControlLook::BControlLook():
diff --git a/src/kits/tracker/Utilities.cpp b/src/kits/tracker/Utilities.cpp
index 527fd54751..4d37dc9e93 100644
--- a/src/kits/tracker/Utilities.cpp
+++ b/src/kits/tracker/Utilities.cpp
@@ -81,9 +81,6 @@ namespace BPrivate {
 
 const float kExactMatchScore = INFINITY;
 
-const rgb_color	kBlack = {0, 0, 0, 255};
-const rgb_color	kWhite = {255, 255, 255, 255};
-
 
 bool gLocalizedNamePreferred;
 
diff --git a/src/kits/tracker/Utilities.h b/src/kits/tracker/Utilities.h
index c420e6e58c..1a6a2dbb89 100644
--- a/src/kits/tracker/Utilities.h
+++ b/src/kits/tracker/Utilities.h
@@ -72,8 +72,8 @@ class BPose;
 class BPoseView;
 
 // global variables
-extern const rgb_color kBlack;
-extern const rgb_color kWhite;
+static const rgb_color kBlack = {0, 0, 0, 255};
+static const rgb_color kWhite = {255, 255, 255 ,255};
 
 const int64 kHalfKBSize = 512;
 const int64 kKBSize = 1024;