From 6e141d14dfe367098d233a99d55221f357cbb684 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Thu, 24 Mar 2016 05:59:35 +0000
Subject: Fix the "bizarre makefile build error" due to double declarations of
 fl_clip_region(Fl_Region).

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11416 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 FL/mac.H          | 1 -
 FL/win32.H        | 1 -
 FL/x.H            | 2 --
 src/Fl_Window.cxx | 5 +++--
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/FL/mac.H b/FL/mac.H
index da8cf24de..a42109c18 100644
--- a/FL/mac.H
+++ b/FL/mac.H
@@ -215,7 +215,6 @@ extern CGContextRef fl_gc;
 
 extern Window fl_xid(const Fl_Window*);
 extern Fl_Window* fl_find(Window xid);
-void fl_clip_region(Fl_Region);
 
 extern Fl_Bitmask fl_create_bitmask(int w, int h, const uchar *data);
 extern Fl_Bitmask fl_create_alphamask(int w, int h, int d, int ld, const uchar *data);
diff --git a/FL/win32.H b/FL/win32.H
index f78e63bcc..87430b9b3 100644
--- a/FL/win32.H
+++ b/FL/win32.H
@@ -107,7 +107,6 @@ FL_EXPORT Window fl_xid_(const Fl_Window* w);
 #endif // FL_LIBRARY || FL_INTERNALS
 
 FL_EXPORT Fl_Window* fl_find(Window xid);
-void fl_clip_region(Fl_Region);
 
 // most recent fl_color() or fl_rgbcolor() points at one of these:
 extern FL_EXPORT struct Fl_XMap {
diff --git a/FL/x.H b/FL/x.H
index 65881b655..7cc5b4a77 100644
--- a/FL/x.H
+++ b/FL/x.H
@@ -67,8 +67,6 @@ extern FL_EXPORT GC fl_gc;
 extern FL_EXPORT Window fl_window;
 FL_EXPORT ulong fl_xpixel(Fl_Color i);
 FL_EXPORT ulong fl_xpixel(uchar r, uchar g, uchar b);
-FL_EXPORT void fl_clip_region(Fl_Region);
-FL_EXPORT Fl_Region fl_clip_region();
 
 // feed events into fltk:
 FL_EXPORT int fl_handle(const XEvent&);
diff --git a/src/Fl_Window.cxx b/src/Fl_Window.cxx
index c6231168b..05b8a8470 100644
--- a/src/Fl_Window.cxx
+++ b/src/Fl_Window.cxx
@@ -21,11 +21,12 @@
 // crap you need to do to communicate with X is in Fl_x.cxx, the
 // equivalent (but totally different) crap for MSWindows is in Fl_win32.cxx
 #include <FL/Fl.H>
+#include <FL/x.H>
 #include <FL/Fl_Window_Driver.H>
 #include <FL/Fl_RGB_Image.H>
 #include <FL/Fl_Window.H>
 #include <FL/Fl_Tooltip.H>
-#include <FL/Fl_Graphics_Driver.H>     // for fl_graphics_driver
+#include <FL/fl_draw.H>
 #include <stdlib.h>
 #include "flstring.h"
 
@@ -443,7 +444,7 @@ void Fl_Window::flush()
 {
   if (!shown()) return;
   make_current();
-  fl_graphics_driver->clip_region(i->region);
+  fl_clip_region(i->region);
   i->region = 0;
   draw();
 }
-- 
cgit v1.2.3