diff options
| author | Manolo Gouy <Manolo> | 2016-03-29 06:12:12 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-03-29 06:12:12 +0000 |
| commit | 8ee4c7303f4e075674f3d02140f84ae3e7bb4d04 (patch) | |
| tree | 56ed6f49a081d695258565c3787964578efc8677 | |
| parent | d9f5412413f46436508e5156f2e58c70c13cf770 (diff) | |
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
| -rw-r--r-- | FL/fl_utf8.h | 2 | ||||
| -rw-r--r-- | src/drivers/Posix/Fl_Posix_System_Driver.cxx | 1 | ||||
| -rw-r--r-- | src/fl_shortcut.cxx | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/FL/fl_utf8.h b/FL/fl_utf8.h index fe23fe93f..88ee4f035 100644 --- 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 diff --git a/src/drivers/Posix/Fl_Posix_System_Driver.cxx b/src/drivers/Posix/Fl_Posix_System_Driver.cxx index 9cdf8c2dd..ee3c70fe4 100644 --- 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 diff --git a/src/fl_shortcut.cxx b/src/fl_shortcut.cxx index e9ccec528..086319a10 100644 --- 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 /** |