From 9a376a61da4356f47020418274fbd238a2537ca6 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Thu, 28 Jan 2016 00:06:23 +0000 Subject: Fix duplicate of FLTK colormap: fl_cmap[] is now global. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11069 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/drivers/Quartz/Fl_Quartz_Graphics_Driver_color.cxx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src') diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_color.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_color.cxx index 2b0cf2f7a..a5c489a5c 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_color.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_color.cxx @@ -34,9 +34,7 @@ #include #include -static unsigned fl_cmap[256] = { -#include "../../fl_cmap.h" // this is a file produced by "cmap.cxx": -}; +extern unsigned fl_cmap[256]; // defined in fl_color.cxx void Fl_Quartz_Graphics_Driver::color(Fl_Color i) { Fl_Graphics_Driver::color(i); -- cgit v1.2.3