diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-06-16 11:55:09 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-06-16 18:58:54 +0000 |
| commit | 6c4ec4aedbe94505d9262952b02f5c7faeb77868 (patch) | |
| tree | 81dc92ffe43e6ea38dbbaf3fbb06d04eb925731d /wsutil | |
| parent | 200c15e96dd84bdc8d6f856b262d726d752594d4 (diff) | |
| download | wireshark-6c4ec4aedbe94505d9262952b02f5c7faeb77868.tar.gz wireshark-6c4ec4aedbe94505d9262952b02f5c7faeb77868.tar.bz2 wireshark-6c4ec4aedbe94505d9262952b02f5c7faeb77868.zip | |
Qt: Make sure we have usable command line arguments.
Call arg_list_utf_16to8 in wireshark-qt.cpp on Windows. Set our default
codec in Qt4 to UTF-8 before doing so.
Bug: 11276
Change-Id: I8e0afb9523ddb5956d30424b7b7ad7f3ea0838c7
Reviewed-on: https://code.wireshark.org/review/8954
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'wsutil')
| -rw-r--r-- | wsutil/unicode-utils.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/wsutil/unicode-utils.h b/wsutil/unicode-utils.h index 83fa2bda67..865563e231 100644 --- a/wsutil/unicode-utils.h +++ b/wsutil/unicode-utils.h @@ -34,6 +34,10 @@ * Unicode convenience routines. */ +#ifdef __cplusplus +extern "C" { +#endif + WS_DLL_PUBLIC int ws_utf8_char_len(guint8 ch); @@ -99,4 +103,8 @@ void arg_list_utf_16to8(int argc, char *argv[]); #define SURROGATE_VALUE(lead, trail) \ (((((lead) - 0xd800) << 10) | ((trail) - 0xdc00)) + 0x100000) +#ifdef __cplusplus +} +#endif + #endif /* __UNICODEUTIL_H__ */ |