Use <config.h> when appropriate.

2021-02-16 11:08:30 +01:00 · 2021-02-16 11:08:30 +01:00 · d93fc2bfa6
commit d93fc2bfa6
parent 06793c50fb
35 changed files with 32 additions and 43 deletions
--- a/src/Fl_Device.cxx
+++ b/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>

--- a/src/Fl_Gl_Choice.cxx
+++ b/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>
--- a/src/Fl_Gl_Device_Plugin.cxx
+++ b/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"
--- a/src/Fl_Gl_Overlay.cxx
+++ b/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>
--- a/src/Fl_Graphics_Driver.cxx
+++ b/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>
--- a/src/Fl_Image.cxx
+++ b/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>
--- a/src/Fl_cocoa.mm
+++ b/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"
--- a/src/Fl_win32.cxx
+++ b/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"
--- a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx
+++ b/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"
--- a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx
+++ b/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"
--- a/src/drivers/GDI/Fl_GDI_Copy_Surface_Driver.cxx
+++ b/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"
--- a/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx
+++ b/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>
--- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx
+++ b/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>
--- a/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx
+++ b/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>
--- a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.cxx
+++ b/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>
--- a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_color.cxx
+++ b/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>
--- a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.cxx
+++ b/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>
--- a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_line_style.cxx
+++ b/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>
--- a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.cxx
+++ b/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>
--- a/src/drivers/Posix/Fl_Posix_Printer_Driver.cxx
+++ b/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)
--- a/src/drivers/Posix/Fl_Posix_System_Driver.H
+++ b/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>
--- a/src/drivers/PostScript/Fl_PostScript_Graphics_Driver.H
+++ b/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
--- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx
+++ b/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>
--- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx
+++ b/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>
--- a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx
+++ b/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>
--- a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx
+++ b/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>
--- a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx
+++ b/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>
--- a/src/drivers/X11/Fl_X11_Screen_Driver.cxx
+++ b/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"
--- a/src/drivers/X11/Fl_X11_System_Driver.H
+++ b/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 {
--- a/src/drivers/X11/Fl_X11_Window_Driver.cxx
+++ b/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"
--- a/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx
+++ b/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>
--- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx
+++ b/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>
--- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx
+++ b/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>
--- a/src/gl_draw.cxx
+++ b/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)

--- a/src/gl_start.cxx
+++ b/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>