diff options
| author | Manolo Gouy <Manolo> | 2016-03-29 09:29:51 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-03-29 09:29:51 +0000 |
| commit | 4fcefc68f8cf9c2648c7140a08fa492c29896c3f (patch) | |
| tree | 0b21a8db3670e0a410fabb83e0cda5d5fe769b61 /FL/fl_utf8.h | |
| parent | 21655099a71718f7671e634a9b4c4079d135cfaf (diff) | |
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
Diffstat (limited to 'FL/fl_utf8.h')
| -rw-r--r-- | FL/fl_utf8.h | 10 |
1 files changed, 5 insertions, 5 deletions
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 <sys/stat.h> # include <locale.h> # include <ctype.h> -# 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 <wchar.h> # include <sys/stat.h> -# define xchar wchar_t +//# define xchar wchar_t #elif defined(ANDROID) # include <wchar.h> -# 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 <sys/types.h> @@ -79,7 +79,7 @@ //# include <X11/Xlib.h> # endif /* defined(FL_LIBRARY) -- don't expose X11 headers in user space */ # include <locale.h> -# define xchar unsigned short +//# define xchar unsigned short #endif #ifdef __cplusplus |