diff options
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/xutf8/lcUniConv/cp936ext.h | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1cb57df34..9c58ed958 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -524,9 +524,11 @@ if(FLTK_USE_X11) if(NOT USE_XFT) list(APPEND CFILES xutf8/utf8Utils.c - xutf8/utf8Wrap.c xutf8/utf8Input.c ) + if(NOT APPLE) + list(APPEND CFILES xutf8/utf8Wrap.c) + endif(NOT APPLE) endif(NOT USE_XFT) endif(FLTK_USE_X11) diff --git a/src/xutf8/lcUniConv/cp936ext.h b/src/xutf8/lcUniConv/cp936ext.h index 1d72abb15..6b3e6820d 100644 --- a/src/xutf8/lcUniConv/cp936ext.h +++ b/src/xutf8/lcUniConv/cp936ext.h @@ -13,8 +13,6 @@ * * https://www.fltk.org/bugs.php */ -#include <FL/fl_config.h> -#if !defined(_WIN32) && (!defined(__APPLE__) || defined(FLTK_USE_X11)) #ifndef CP936 #ifdef NEED_TOWC @@ -6241,5 +6239,3 @@ cp936ext_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) #endif /* NEED_TOMB */ #endif /* CP936 */ - -#endif /* _WIN32 || __APPLE__ */ |