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 /src/gl_draw.cxx | |
| 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 'src/gl_draw.cxx')
| -rw-r--r-- | src/gl_draw.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gl_draw.cxx b/src/gl_draw.cxx index 10801ae40..4e1612c6e 100644 --- a/src/gl_draw.cxx +++ b/src/gl_draw.cxx @@ -192,11 +192,11 @@ void gl_draw(const char* str, int n) { #ifdef __APPLE__ gl_draw_textures(str, n); #else - static xchar *buf = NULL; + static unsigned short *buf = NULL; static int l = 0; int wn = fl_utf8toUtf16(str, n, (unsigned short*)buf, l); if(wn >= l) { - buf = (xchar*) realloc(buf, sizeof(xchar) * (wn + 1)); + buf = (unsigned short*) realloc(buf, sizeof(unsigned short) * (wn + 1)); l = wn + 1; wn = fl_utf8toUtf16(str, n, (unsigned short*)buf, l); } |
