Begin to clean fl_utf8.h from its platform-dependent content.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11457 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-03-29 06:12:12 +00:00 · 2016-03-29 06:12:12 +00:00 · 8ee4c7303f
commit 8ee4c7303f
parent d9f5412413
3 changed files with 3 additions and 1 deletions
--- a/FL/fl_utf8.h
+++ b/FL/fl_utf8.h
@ -76,7 +76,7 @@
 #  include <sys/stat.h>
 #  if defined(FL_LIBRARY) /* don't expose X11 headers in user space */
 #    include <X11/Xlocale.h>
-#    include <X11/Xlib.h>
+//#    include <X11/Xlib.h>
 #  endif /* defined(FL_LIBRARY) -- don't expose X11 headers in user space */
 #  include <locale.h>
 #  define xchar unsigned short
--- a/src/drivers/Posix/Fl_Posix_System_Driver.cxx
+++ b/src/drivers/Posix/Fl_Posix_System_Driver.cxx
@ -19,6 +19,7 @@

 #include "Fl_Posix_System_Driver.H"
 #include <FL/Fl.H>
+#include <X11/Xlib.h>

 extern XIC fl_xim_ic; // in Fl_x.cxx

--- a/src/fl_shortcut.cxx
+++ b/src/fl_shortcut.cxx
@ -44,6 +44,7 @@
 #elif defined(FL_PORTING)
 #  pragma message "FL_PORTING: implement keyboard shortcut handling here"
 #else
+#include <X11/Xlib.h>
 #endif

 /**