summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlbrecht Schlosser <albrechts.fltk@online.de>2016-01-28 00:06:23 +0000
committerAlbrecht Schlosser <albrechts.fltk@online.de>2016-01-28 00:06:23 +0000
commit9a376a61da4356f47020418274fbd238a2537ca6 (patch)
tree3a4d7e1b28a58ffd85a83b17cdc0c128c88cbad9 /src
parentdb9befe6cf1a43e29c19f60e34f4a63cffd08224 (diff)
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
Diffstat (limited to 'src')
-rw-r--r--src/drivers/Quartz/Fl_Quartz_Graphics_Driver_color.cxx4
1 files changed, 1 insertions, 3 deletions
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 <FL/x.H>
#include <FL/fl_draw.H>
-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);