From db9befe6cf1a43e29c19f60e34f4a63cffd08224 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Thu, 28 Jan 2016 00:02:51 +0000 Subject: Fix Linux - remove duplicates introduced by merge conflicts. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11068 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/fl_color.cxx | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src') diff --git a/src/fl_color.cxx b/src/fl_color.cxx index e0aa7bd3f..bf448b6d3 100644 --- a/src/fl_color.cxx +++ b/src/fl_color.cxx @@ -29,19 +29,12 @@ #include #include "config_lib.h" -// Apple Quartz driver in "drivers/Quartz/Fl_Quartz_Graphics_Driver_color.cxx" - // Remove #ifndef FL_LIBRARY_CMAKE and the entire block of #include // statements when the new build system is ready: #ifndef FL_LIBRARY_CMAKE // ----------------------------------------------------------------------------- -static unsigned fl_cmap[256] = { -#include "fl_cmap.h" // this is a file produced by "cmap.cxx": -}; - - -// ----------------------------------------------------------------------------- +// Apple Quartz driver in "drivers/Quartz/Fl_Quartz_Graphics_Driver_color.cxx" #ifdef FL_CFG_GFX_GDI -- cgit v1.2.3