diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-01-28 00:02:51 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-01-28 00:02:51 +0000 |
| commit | db9befe6cf1a43e29c19f60e34f4a63cffd08224 (patch) | |
| tree | a2c6e491f26d6cd62c99da030f18e3e87eb65022 /src | |
| parent | 48db7a07ef8e28dd4ab42b7bdc48669b503f354b (diff) | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/fl_color.cxx | 9 |
1 files changed, 1 insertions, 8 deletions
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 <config.h> #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 |