From 8d89d760fa2d01b7f6e38067793d1b480817ae78 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Wed, 23 Mar 2016 13:56:46 +0000 Subject: Fix Linux build: one include file and missing #include . git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11405 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/drivers/X11/Fl_X11_Window_Driver.cxx | 2 +- src/drivers/Xlib/Fl_Translated_Xlib_Graphics_Driver.cxx | 1 + src/drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.cxx | 1 + src/drivers/Xlib/Fl_Xlib_Graphics_Driver_color.cxx | 1 + src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx | 1 + src/drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.cxx | 14 +++++--------- 6 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/drivers') diff --git a/src/drivers/X11/Fl_X11_Window_Driver.cxx b/src/drivers/X11/Fl_X11_Window_Driver.cxx index 59313cc42..6de56f229 100644 --- a/src/drivers/X11/Fl_X11_Window_Driver.cxx +++ b/src/drivers/X11/Fl_X11_Window_Driver.cxx @@ -19,7 +19,7 @@ #include "../../config_lib.h" #include "Fl_X11_Window_Driver.H" -#include "Fl_Xlib_Graphics_Driver.H" +#include "../Xlib/Fl_Xlib_Graphics_Driver.H" #include #include diff --git a/src/drivers/Xlib/Fl_Translated_Xlib_Graphics_Driver.cxx b/src/drivers/Xlib/Fl_Translated_Xlib_Graphics_Driver.cxx index 89871f9b4..88a39d9c6 100644 --- a/src/drivers/Xlib/Fl_Translated_Xlib_Graphics_Driver.cxx +++ b/src/drivers/Xlib/Fl_Translated_Xlib_Graphics_Driver.cxx @@ -16,6 +16,7 @@ // http://www.fltk.org/str.php // +#include #include "Fl_Translated_Xlib_Graphics_Driver.H" #include diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.cxx index ae24fbc84..a47e605b6 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.cxx @@ -16,6 +16,7 @@ // http://www.fltk.org/str.php // +#include #include "Fl_Xlib_Graphics_Driver.H" #include diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_color.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_color.cxx index 8e6c1038c..5f241423b 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_color.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_color.cxx @@ -31,6 +31,7 @@ // being used to index arrays. So I always copy them to an integer // before use. +#include #include "Fl_Xlib_Graphics_Driver.H" # include "../../Fl_XColor.H" # include diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx index 4e89df5bd..87df1da76 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx @@ -45,6 +45,7 @@ //////////////////////////////////////////////////////////////// +#include #include "Fl_Xlib_Graphics_Driver.H" # include # include diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.cxx index 209e688dd..99f1da627 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.cxx @@ -16,15 +16,13 @@ // http://www.fltk.org/str.php // -#ifndef FL_CFG_GFX_XLIB_VERTEX_CXX -#define FL_CFG_GFX_XLIB_VERTEX_CXX - /** - \file Fl_Xlib_Graphics_Driver_vertex.cxx - \brief Portable drawing code for drawing arbitrary shapes with - simple 2D transformations, implemented for X11 Xlib. - */ + \file Fl_Xlib_Graphics_Driver_vertex.cxx + \brief Portable drawing code for drawing arbitrary shapes with + simple 2D transformations, implemented for X11 Xlib. +*/ +#include #include "Fl_Xlib_Graphics_Driver.H" #include @@ -109,8 +107,6 @@ void Fl_Xlib_Graphics_Driver::circle(double x, double y,double r) { (fl_display, fl_window, gc_, llx, lly, w, h, 0, 360*64); } -#endif // FL_CFG_GFX_XLIB_VERTEX_CXX - // // End of "$Id$". // -- cgit v1.2.3