From 4fcefc68f8cf9c2648c7140a08fa492c29896c3f Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Tue, 29 Mar 2016 09:29:51 +0000 Subject: Remove the platform-dependent type xchar File fl_utf8.h defines the xchar type with a platform-dependent value (wchar_t or unsigned short). But it is used exclusively by WIN32 code (0 use in cross-platform code, 0 use in APPLE or in USE_X11 code). Thus, we can just get rid of this type and replace it by wchar_t where it is used. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11459 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/fl_utf8.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'FL') diff --git a/FL/fl_utf8.h b/FL/fl_utf8.h index 88ee4f035..b4a55e62c 100644 --- a/FL/fl_utf8.h +++ b/FL/fl_utf8.h @@ -47,7 +47,7 @@ # include # include # include -# define xchar wchar_t +//# define xchar wchar_t # if !defined(FL_DLL) && !defined(__CYGWIN__) # undef strdup # define strdup _strdup @@ -63,13 +63,13 @@ #elif defined(__APPLE__) /* PORTME: should not be in the header */ # include # include -# define xchar wchar_t +//# define xchar wchar_t #elif defined(ANDROID) # include -# define xchar wchar_t +//# define xchar wchar_t #elif defined(FL_PORTING) # pragma message "FL_PORTING: include UTF-8 support files and define UTF-8 types" -# define xchar unsigned short +//# define xchar unsigned short /* TODO: the condition below is not portable! */ #else /* X11 */ # include @@ -79,7 +79,7 @@ //# include # endif /* defined(FL_LIBRARY) -- don't expose X11 headers in user space */ # include -# define xchar unsigned short +//# define xchar unsigned short #endif #ifdef __cplusplus -- cgit v1.2.3