From a306fe46d39e5c54f90f288846da7b9a0e762cb5 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Thu, 20 Jan 2011 13:22:30 +0000
Subject: Redefined fl_xid() as an inline function when used inside the FLTK
 library.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8295 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/Fl_win32.cxx | 2 +-
 src/Fl_x.cxx     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx
index 0c276636d..717a07e1e 100644
--- a/src/Fl_win32.cxx
+++ b/src/Fl_win32.cxx
@@ -1933,7 +1933,7 @@ Fl_Region XRectangleRegion(int x, int y, int w, int h) {
   return CreatePolygonRgn(pt, 4, ALTERNATE);
 }
 
-Window fl_xid(const Fl_Window *w) {
+Window fl_xid_(const Fl_Window *w) {
   Fl_X *temp = Fl_X::i(w); 
   return temp ? temp->xid : 0;
 }
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx
index 47c93619b..81e1bcf0c 100644
--- a/src/Fl_x.cxx
+++ b/src/Fl_x.cxx
@@ -1880,7 +1880,7 @@ void Fl_Window::make_current() {
 #endif
 }
 
-Window fl_xid(const Fl_Window* w)
+Window fl_xid_(const Fl_Window* w)
 {
   return Fl_X::i(w)->xid;
 }
-- 
cgit v1.2.3