diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2010-12-08 12:15:48 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2010-12-08 12:15:48 +0000 |
| commit | f90c190a8e42c65d26dcbf889801cfe1e42c5dab (patch) | |
| tree | 7f0360e4cd94cfc13183d43b8e9d7d42f132d530 /src/fl_utf8.cxx | |
| parent | 3105ab9de50b8e0b3fb59942e867f26c16ab5a03 (diff) | |
Fixed some compiler warnings, most of them in Windows-specific code.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7975 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/fl_utf8.cxx')
| -rw-r--r-- | src/fl_utf8.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/fl_utf8.cxx b/src/fl_utf8.cxx index ccbe98e95..da8dcfba8 100644 --- a/src/fl_utf8.cxx +++ b/src/fl_utf8.cxx @@ -420,9 +420,10 @@ static char *buf = NULL; static int buf_len = 0; static unsigned short *wbufa = NULL; +// FIXME: This should *maybe* return 'const char *' instead of 'char *' char *fl_utf8_to_locale(const char *s, int len, UINT codepage) { - if (!s) return ""; + if (!s) return (char *)""; int l = 0; // if (buf_len < len * 2 + 1) { // buf_len = len * 2 + 1; @@ -447,9 +448,10 @@ char *fl_utf8_to_locale(const char *s, int len, UINT codepage) return buf; } +// FIXME: This should maybe return 'const char *' instead of 'char *' char *fl_locale_to_utf8(const char *s, int len, UINT codepage) { - if (!s) return ""; + if (!s) return (char *)""; int l = 0; if (buf_len < len * 5 + 1) { buf_len = len * 5 + 1; |