| |
commit d93fc2bfa6b3bd5c33912e2eaaa2d42dfd5f473f
Author: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
AuthorDate: Tue Feb 16 11:08:30 2021 +0100
Commit: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
CommitDate: Tue Feb 16 11:08:59 2021 +0100
Use <config.h> when appropriate.
src/Fl_Device.cxx | 2 +-
src/Fl_Gl_Choice.cxx | 2 +-
src/Fl_Gl_Device_Plugin.cxx | 2 +-
src/Fl_Gl_Overlay.cxx | 2 +-
src/Fl_Graphics_Driver.cxx | 2 +-
src/Fl_Image.cxx | 2 +-
src/Fl_cocoa.mm | 2 +-
src/Fl_win32.cxx | 2 +-
src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx | 2 +-
src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx | 2 +-
src/drivers/GDI/Fl_GDI_Copy_Surface_Driver.cxx | 3 +--
src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx | 2 +-
src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx | 1 -
src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx | 2 +-
src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.cxx | 1 -
src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_color.cxx | 3 +--
src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.cxx | 1 -
src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_line_style.cxx | 1 -
src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.cxx | 1 -
src/drivers/Posix/Fl_Posix_Printer_Driver.cxx | 6 +++---
src/drivers/Posix/Fl_Posix_System_Driver.H | 2 +-
src/drivers/PostScript/Fl_PostScript_Graphics_Driver.H | 2 +-
src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx | 2 +-
src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx | 5 +----
src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx | 2 +-
src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx | 2 +-
src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx | 2 +-
src/drivers/X11/Fl_X11_Screen_Driver.cxx | 2 +-
src/drivers/X11/Fl_X11_System_Driver.H | 2 +-
src/drivers/X11/Fl_X11_Window_Driver.cxx | 2 +-
src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx | 3 +--
src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx | 2 +-
src/drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx | 2 +-
src/gl_draw.cxx | 2 +-
src/gl_start.cxx | 2 +-
35 files changed, 32 insertions(+), 43 deletions(-)
diff --git src/Fl_Device.cxx src/Fl_Device.cxx
index 30726b1..f977210 100644
--- src/Fl_Device.cxx
+++ src/Fl_Device.cxx
@@ -14,8 +14,8 @@
// https://www.fltk.org/bugs.php
//
+#include <config.h>
#include <FL/Fl.H>
-#include "config_lib.h"
#include <FL/Fl_Device.H>
#include <FL/Fl_Graphics_Driver.H>
diff --git src/Fl_Gl_Choice.cxx src/Fl_Gl_Choice.cxx
index 9936873..e444704 100644
--- src/Fl_Gl_Choice.cxx
+++ src/Fl_Gl_Choice.cxx
@@ -14,7 +14,7 @@
// https://www.fltk.org/bugs.php
//
-#include "config_lib.h"
+#include <config.h>
#if HAVE_GL
# include <FL/Fl.H>
diff --git src/Fl_Gl_Device_Plugin.cxx src/Fl_Gl_Device_Plugin.cxx
index f2bdb4e..79188ed 100644
--- src/Fl_Gl_Device_Plugin.cxx
+++ src/Fl_Gl_Device_Plugin.cxx
@@ -14,7 +14,7 @@
// https://www.fltk.org/bugs.php
//
-#include "config_lib.h"
+#include <config.h>
#include <FL/Fl_Gl_Window.H>
#include <FL/Fl_RGB_Image.H>
#include "drivers/OpenGL/Fl_OpenGL_Display_Device.H"
diff --git src/Fl_Gl_Overlay.cxx src/Fl_Gl_Overlay.cxx
index 04c906a..043a213 100644
--- src/Fl_Gl_Overlay.cxx
+++ src/Fl_Gl_Overlay.cxx
@@ -14,7 +14,7 @@
// https://www.fltk.org/bugs.php
//
-#include "config_lib.h"
+#include <config.h>
#if HAVE_GL
#include <FL/Fl.H>
diff --git src/Fl_Graphics_Driver.cxx src/Fl_Graphics_Driver.cxx
index 815ef2a..d33e5e5 100644
--- src/Fl_Graphics_Driver.cxx
+++ src/Fl_Graphics_Driver.cxx
@@ -20,8 +20,8 @@
\{
*/
+#include <config.h>
#include <FL/Fl.H>
-#include "config_lib.h"
#include <FL/Fl_Graphics_Driver.H>
#include "Fl_Screen_Driver.H"
#include <FL/Fl_Image.H>
diff --git src/Fl_Image.cxx src/Fl_Image.cxx
index d38148c..81a1541 100644
--- src/Fl_Image.cxx
+++ src/Fl_Image.cxx
@@ -14,7 +14,7 @@
// https://www.fltk.org/bugs.php
//
-#include "config_lib.h"
+#include <config.h>
#include <FL/Fl.H>
#include <FL/fl_draw.H>
#include <FL/Fl_Widget.H>
diff --git src/Fl_cocoa.mm src/Fl_cocoa.mm
index e67e964..15ed5fb 100644
--- src/Fl_cocoa.mm
+++ src/Fl_cocoa.mm
@@ -20,7 +20,7 @@ extern "C" {
#include <pthread.h>
}
-#include "config_lib.h"
+#include <config.h>
#include <FL/Fl.H>
#include <FL/platform.H>
#include "Fl_Window_Driver.H"
diff --git src/Fl_win32.cxx src/Fl_win32.cxx
index 49f7156..1e5b732 100644
--- src/Fl_win32.cxx
+++ src/Fl_win32.cxx
@@ -49,7 +49,7 @@ void fl_free_fonts(void);
void fl_release_dc(HWND, HDC);
void fl_cleanup_dc_list(void);
-#include "config_lib.h"
+#include <config.h>
#include <FL/Fl.H>
#include <FL/platform.H>
#include "Fl_Window_Driver.H"
diff --git src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx
index 1984ae9..651da1f 100644
--- src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx
+++ src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx
@@ -15,7 +15,7 @@
//
-#include "../../config_lib.h"
+#include <config.h>
#include "Fl_Cocoa_Screen_Driver.H"
#include "Fl_Cocoa_Window_Driver.H"
#include "../Quartz/Fl_Font.H"
diff --git src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx
index ed2772b..1b6205c 100644
--- src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx
+++ src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx
@@ -15,7 +15,7 @@
//
-#include "../../config_lib.h"
+#include <config.h>
#include "Fl_Cocoa_Window_Driver.H"
#include "../../Fl_Screen_Driver.H"
#include "../Quartz/Fl_Quartz_Graphics_Driver.H"
diff --git src/drivers/GDI/Fl_GDI_Copy_Surface_Driver.cxx src/drivers/GDI/Fl_GDI_Copy_Surface_Driver.cxx
index f435894..7117c6c 100644
--- src/drivers/GDI/Fl_GDI_Copy_Surface_Driver.cxx
+++ src/drivers/GDI/Fl_GDI_Copy_Surface_Driver.cxx
@@ -14,8 +14,7 @@
// https://www.fltk.org/bugs.php
//
-#include "../../config_lib.h"
-
+#include <config.h>
#include <FL/Fl_Copy_Surface.H>
#include <FL/platform.H>
#include "Fl_GDI_Graphics_Driver.H"
diff --git src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx
index b70f579..dd9ed5d 100644
--- src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx
+++ src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx
@@ -15,7 +15,7 @@
//
-#include "../../config_lib.h"
+#include <config.h>
#include "Fl_GDI_Graphics_Driver.H"
#include <FL/Fl.H>
#include <FL/platform.H>
diff --git src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx
index 50e00c5..8e45c6e 100644
--- src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx
+++ src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx
@@ -21,7 +21,6 @@
*/
#include <config.h>
-#include "../../config_lib.h"
#include <FL/Fl.H>
#include <FL/Fl_Widget.H>
#include <FL/fl_draw.H>
diff --git src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx
index b1fb688..48a1854 100644
--- src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx
+++ src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx
@@ -14,7 +14,7 @@
// https://www.fltk.org/bugs.php
//
-#include "../../config_lib.h"
+#include <config.h>
#include <FL/Fl_Gl_Window.H>
#include "../../Fl_Gl_Window_Driver.H"
#include <FL/Fl_Image.H>
diff --git src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.cxx src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.cxx
index c4efee2..ba5a7e7 100644
--- src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.cxx
+++ src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.cxx
@@ -20,7 +20,6 @@
*/
#include <config.h>
-#include "../../config_lib.h"
#include "Fl_OpenGL_Graphics_Driver.H"
#include <FL/gl.h>
#include <FL/Fl_Gl_Window.H>
diff --git src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_color.cxx src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_color.cxx
index f6fcbb8..54810ca 100644
--- src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_color.cxx
+++ src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_color.cxx
@@ -19,8 +19,7 @@
\brief Color handling
*/
-#include "../../config_lib.h"
-// #include <config.h>
+#include <config.h>
#include "Fl_OpenGL_Graphics_Driver.H"
#include <FL/gl.h>
#include <FL/Fl_Gl_Window.H>
diff --git src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.cxx src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.cxx
index 24ce539..fc6bc48 100644
--- src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.cxx
+++ src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.cxx
@@ -26,7 +26,6 @@
#include <config.h>
-#include "../../config_lib.h"
#include "Fl_OpenGL_Graphics_Driver.H"
#include <FL/gl.h>
#include <FL/Fl_Gl_Window.H>
diff --git src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_line_style.cxx src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_line_style.cxx
index 8b5bf35..89dea69 100644
--- src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_line_style.cxx
+++ src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_line_style.cxx
@@ -20,7 +20,6 @@
*/
#include <config.h>
-#include "../../config_lib.h"
#include "Fl_OpenGL_Graphics_Driver.H"
#include <FL/gl.h>
#include <FL/Fl_Gl_Window.H>
diff --git src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.cxx src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.cxx
index 049a606..f47aaab 100644
--- src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.cxx
+++ src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.cxx
@@ -21,7 +21,6 @@
*/
#include <config.h>
-#include "../../config_lib.h"
#include "Fl_OpenGL_Graphics_Driver.H"
#include <FL/gl.h>
#include <FL/Fl_Gl_Window.H>
diff --git src/drivers/Posix/Fl_Posix_Printer_Driver.cxx src/drivers/Posix/Fl_Posix_Printer_Driver.cxx
index 5fcb464..904c6d3 100644
--- src/drivers/Posix/Fl_Posix_Printer_Driver.cxx
+++ src/drivers/Posix/Fl_Posix_Printer_Driver.cxx
@@ -14,9 +14,9 @@
// https://www.fltk.org/bugs.php
//
-#include "../../config_lib.h"
+#include <config.h>
-#if defined(FL_CFG_PRN_PS) && !defined(FL_NO_PRINT_SUPPORT)
+#if !defined(FL_NO_PRINT_SUPPORT)
#include <FL/Fl_PostScript.H>
#include "../PostScript/Fl_PostScript_Graphics_Driver.H"
@@ -331,4 +331,4 @@ int Fl_Posix_Printer_Driver::begin_job(int pages, int *firstpage, int *lastpage,
return ps->start_postscript(pages, format, layout); // start printing
}
-#endif // defined(FL_CFG_PRN_PS) && !defined(FL_NO_PRINT_SUPPORT)
+#endif // !defined(FL_NO_PRINT_SUPPORT)
diff --git src/drivers/Posix/Fl_Posix_System_Driver.H src/drivers/Posix/Fl_Posix_System_Driver.H
index 365cce8..e077e49 100644
--- src/drivers/Posix/Fl_Posix_System_Driver.H
+++ src/drivers/Posix/Fl_Posix_System_Driver.H
@@ -23,7 +23,7 @@
#ifndef FL_POSIX_SYSTEM_DRIVER_H
#define FL_POSIX_SYSTEM_DRIVER_H
-#include "../../config_lib.h"
+#include <config.h>
#include "../../Fl_System_Driver.H"
#include <stdlib.h>
#include <unistd.h>
diff --git src/drivers/PostScript/Fl_PostScript_Graphics_Driver.H src/drivers/PostScript/Fl_PostScript_Graphics_Driver.H
index 66f1b6b..d41a0a5 100644
--- src/drivers/PostScript/Fl_PostScript_Graphics_Driver.H
+++ src/drivers/PostScript/Fl_PostScript_Graphics_Driver.H
@@ -21,7 +21,7 @@
#ifndef FL_POSTSCRIPT_GRAPHICS_DRIVER_H
#define FL_POSTSCRIPT_GRAPHICS_DRIVER_H
-#include "../../config_lib.h"
+#include <config.h>
#include <FL/Fl_PostScript.H>
#ifndef USE_PANGO
diff --git src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx
index 1c5c7e9..9d82d5c 100644
--- src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx
+++ src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx
@@ -14,7 +14,7 @@
// https://www.fltk.org/bugs.php
//
-#include "../../config_lib.h"
+#include <config.h>
#include "Fl_Quartz_Graphics_Driver.H"
#include "../Darwin/Fl_Darwin_System_Driver.H"
#include <FL/platform.H>
diff --git src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx
index 98c3761..dd73fc8 100644
--- src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx
+++ src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx
@@ -14,11 +14,8 @@
// https://www.fltk.org/bugs.php
//
-#include "../../config_lib.h"
-
-#include "Fl_Quartz_Graphics_Driver.H"
-
#include <config.h>
+#include "Fl_Quartz_Graphics_Driver.H"
#include <FL/Fl.H>
#include <FL/fl_draw.H>
#include <FL/platform.H>
diff --git src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx
index d28ccca..7c57d08 100644
--- src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx
+++ src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx
@@ -15,7 +15,7 @@
//
-#include "../../config_lib.h"
+#include <config.h>
#include "Fl_WinAPI_Screen_Driver.H"
#include "../GDI/Fl_Font.H"
#include <FL/Fl.H>
diff --git src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx
index 518b328..9c9d355 100644
--- src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx
+++ src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx
@@ -14,7 +14,7 @@
// https://www.fltk.org/bugs.php
//
-#include "../../config_lib.h"
+#include <config.h>
#include "Fl_WinAPI_System_Driver.H"
#include <FL/Fl.H>
#include <FL/fl_utf8.h>
diff --git src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx
index 8d0fddc..6e5d693 100644
--- src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx
+++ src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx
@@ -15,7 +15,7 @@
//
-#include "../../config_lib.h"
+#include <config.h>
#include <FL/fl_draw.H>
#include <FL/Fl.H>
#include <FL/Fl_Window.H>
diff --git src/drivers/X11/Fl_X11_Screen_Driver.cxx src/drivers/X11/Fl_X11_Screen_Driver.cxx
index ec3a6e0..33f087d 100644
--- src/drivers/X11/Fl_X11_Screen_Driver.cxx
+++ src/drivers/X11/Fl_X11_Screen_Driver.cxx
@@ -15,7 +15,7 @@
//
-#include "../../config_lib.h"
+#include <config.h>
#include "Fl_X11_Screen_Driver.H"
#include "../Xlib/Fl_Font.H"
#include "Fl_X11_Window_Driver.H"
diff --git src/drivers/X11/Fl_X11_System_Driver.H src/drivers/X11/Fl_X11_System_Driver.H
index 004e474..b4ade96 100644
--- src/drivers/X11/Fl_X11_System_Driver.H
+++ src/drivers/X11/Fl_X11_System_Driver.H
@@ -18,7 +18,7 @@
#ifndef FL_X11_SYSTEM_DRIVER_H
#define FL_X11_SYSTEM_DRIVER_H
-#include "../../config_lib.h"
+#include <config.h>
#include "../Posix/Fl_Posix_System_Driver.H"
class Fl_X11_System_Driver : public Fl_Posix_System_Driver {
diff --git src/drivers/X11/Fl_X11_Window_Driver.cxx src/drivers/X11/Fl_X11_Window_Driver.cxx
index d757aa7..ab15f27 100644
--- src/drivers/X11/Fl_X11_Window_Driver.cxx
+++ src/drivers/X11/Fl_X11_Window_Driver.cxx
@@ -15,7 +15,7 @@
//
-#include "../../config_lib.h"
+#include <config.h>
#include "Fl_X11_Window_Driver.H"
#include "Fl_X11_Screen_Driver.H"
#include "../Xlib/Fl_Xlib_Graphics_Driver.H"
diff --git src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx
index 738b5a4..0343e9a 100644
--- src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx
+++ src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx
@@ -14,8 +14,7 @@
// https://www.fltk.org/bugs.php
//
-#include "../../config_lib.h"
-
+#include <config.h>
#include <FL/Fl_Copy_Surface.H>
#include <FL/Fl.H>
#include <FL/platform.H>
diff --git src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx
index 46f4446..309df9e 100644
--- src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx
+++ src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx
@@ -15,7 +15,7 @@
//
-#include "../../config_lib.h"
+#include <config.h>
#include "Fl_Xlib_Graphics_Driver.H"
#include "Fl_Font.H"
#include <FL/fl_draw.H>
diff --git src/drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx src/drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx
index ab591da..4a2b48a 100644
--- src/drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx
+++ src/drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx
@@ -19,7 +19,7 @@
\brief X11 Xlib specific line and polygon drawing with integer coordinates.
*/
-#include "../../config_lib.h"
+#include <config.h>
#include <FL/Fl.H>
#include <FL/Fl_Widget.H>
#include <FL/fl_draw.H>
diff --git src/gl_draw.cxx src/gl_draw.cxx
index 125e68c..234edf2 100644
--- src/gl_draw.cxx
+++ src/gl_draw.cxx
@@ -29,7 +29,7 @@
get_list(), gl_bitmap_font() and draw_string_legacy() for the platform's Fl_XXX_Gl_Window_Driver.
*/
-#include "config_lib.h"
+#include <config.h>
#if HAVE_GL || defined(FL_DOXYGEN)
diff --git src/gl_start.cxx src/gl_start.cxx
index f96786c..81a7043 100644
--- src/gl_start.cxx
+++ src/gl_start.cxx
@@ -26,7 +26,7 @@
// be erased when the buffers are swapped (when double buffer hardware
// is being used)
-#include "config_lib.h"
+#include <config.h>
#if HAVE_GL
#include <FL/Fl.H>
[ Direct Link to Message ] | |
