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
---
 src/Fl_Window.cxx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

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