From 24fd68560f7e2b8fe9bfdb676a39ab893c6b8fe0 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Sat, 26 Mar 2016 18:03:10 +0000
Subject: Public header files must not include files from the source tree.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11435 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 FL/Fl_System_Driver.H                        | 16 ++++++++++++----
 src/drivers/Darwin/Fl_Darwin_System_Driver.H |  4 ----
 src/drivers/Posix/Fl_Posix_System_Driver.H   |  4 ----
 src/drivers/WinAPI/Fl_WinAPI_System_Driver.H |  5 -----
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/FL/Fl_System_Driver.H b/FL/Fl_System_Driver.H
index ef64e700b..b39286edd 100644
--- a/FL/Fl_System_Driver.H
+++ b/FL/Fl_System_Driver.H
@@ -18,23 +18,31 @@
 //
 
 /** \file Fl_System_Driver.H
- \brief declaration of classe Fl_System_Driver.
+ \brief declaration of class Fl_System_Driver.
 */
 
 #ifdef __APPLE__
-#include <src/drivers/Darwin/Fl_Darwin_System_Driver.H>
+typedef struct CGContext* Fl_Offscreen;
+typedef struct CGImage* Fl_Bitmask;
+typedef struct flCocoaRegion* Fl_Region;
 
 #elif defined(WIN32)
-#include <src/drivers/WinAPI/Fl_WinAPI_System_Driver.H>
+typedef struct HBITMAP__ *HBITMAP;
+typedef HBITMAP Fl_Offscreen;
+typedef HBITMAP Fl_Bitmask;
+typedef struct HRGN__ *Fl_Region;
 
 #elif defined(FL_PORTING)
 # pragma message "FL_PORTING: define OS-dependent types"
 typedef void* Fl_Offscreen;
 typedef void* Fl_Bitmask;
 typedef void *Fl_Region;
+
 #else
+typedef unsigned long Fl_Offscreen;
+typedef unsigned long Fl_Bitmask;
+typedef struct _XRegion *Fl_Region;
 
-#include <src/drivers/Posix/Fl_Posix_System_Driver.H>
 #endif // __APPLE__
 
 #ifndef FL_SYSTEM_DRIVER_H
diff --git a/src/drivers/Darwin/Fl_Darwin_System_Driver.H b/src/drivers/Darwin/Fl_Darwin_System_Driver.H
index 05bd41e9f..edba76686 100644
--- a/src/drivers/Darwin/Fl_Darwin_System_Driver.H
+++ b/src/drivers/Darwin/Fl_Darwin_System_Driver.H
@@ -27,10 +27,6 @@
 
 #include <FL/Fl_System_Driver.H>
 
-typedef struct CGContext* Fl_Offscreen;
-typedef struct CGImage* Fl_Bitmask;
-typedef struct flCocoaRegion* Fl_Region;
-
 /*
  Move everything here that manages the system interface.
 
diff --git a/src/drivers/Posix/Fl_Posix_System_Driver.H b/src/drivers/Posix/Fl_Posix_System_Driver.H
index 3df22092c..9a1ca7d1d 100644
--- a/src/drivers/Posix/Fl_Posix_System_Driver.H
+++ b/src/drivers/Posix/Fl_Posix_System_Driver.H
@@ -27,10 +27,6 @@
 
 #include <FL/Fl_System_Driver.H>
 
-typedef unsigned long Fl_Offscreen;
-typedef unsigned long Fl_Bitmask;
-typedef struct _XRegion *Fl_Region;
-
 /*
  Move everything here that manages the system interface.
 
diff --git a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H
index 691f3c507..d213fd4af 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H
+++ b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H
@@ -27,11 +27,6 @@
 
 #include <FL/Fl_System_Driver.H>
 
-typedef struct HBITMAP__ *HBITMAP;
-typedef HBITMAP Fl_Offscreen;
-typedef HBITMAP Fl_Bitmask;
-typedef struct HRGN__ *Fl_Region;
-
 /*
  Move everything here that manages the system interface.
 
-- 
cgit v1.2.3