From 17c48175927a5fa8eea52ef09090617b3e9b20f9 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Wed, 30 Dec 2015 12:10:15 +0000 Subject: Add configure and CMake checks for X11/Xregion.h. Configure and CMake now both check if X11/Xregion.h exists on the build system and set HAVE_X11_XREGION_H in config.h accordingly. src/Fl_Pixmap.cxx: modified to use the configure test as proposed by Manolo in fltk.coredev on Dec 13 2015 in thread "Using X11 backend on OS X". git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10983 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_Pixmap.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/Fl_Pixmap.cxx b/src/Fl_Pixmap.cxx index a38565ff7..30d51d5a9 100644 --- a/src/Fl_Pixmap.cxx +++ b/src/Fl_Pixmap.cxx @@ -33,7 +33,9 @@ #include #if defined(USE_X11) -# ifdef __APPLE_CC__ // allows using on Darwin + X11 even if X11/Xregion.h is absent +# if HAVE_X11_XREGION_H +# include +# else // if the X11/Xregion.h header is not available, we assume this is the layout of an X11 Region: typedef struct { short x1, x2, y1, y2; } BOX; @@ -43,10 +45,8 @@ struct _XRegion { BOX *rects; BOX extents; }; -# else -# include -# endif -#endif +# endif // HAVE_X11_XREGION_H +#endif // USE_X11 #include #include "flstring.h" -- cgit v1.2.3