diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2018-04-16 09:24:01 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2018-04-16 07:47:34 +0000 |
| commit | 9330372ea08b07e3f8ee20c2e5136eed57b6c19d (patch) | |
| tree | c68bf066aad6a9e9ce048714344c1cb7dba5ae4f | |
| parent | a94870b1583857ee5a485ce68369373efb3a9fdc (diff) | |
pinyin: move time include to userdict.h
There was a build error on QNX:
share/../include/userdict.h:130:20: error: field 'load_time' has
incomplete type 'ime_pinyin::timeval'
share/../include/userdict.h:130:12: note: forward declaration of
'struct ime_pinyin::timeval'
Change-Id: Id7fc041d7f935fcca72b87b0bfcfd34afa4d8070
Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| -rw-r--r-- | src/virtualkeyboard/3rdparty/pinyin/include/userdict.h | 2 | ||||
| -rw-r--r-- | src/virtualkeyboard/3rdparty/pinyin/share/userdict.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/virtualkeyboard/3rdparty/pinyin/include/userdict.h b/src/virtualkeyboard/3rdparty/pinyin/include/userdict.h index 1b9673f9..db010912 100644 --- a/src/virtualkeyboard/3rdparty/pinyin/include/userdict.h +++ b/src/virtualkeyboard/3rdparty/pinyin/include/userdict.h @@ -25,9 +25,11 @@ // #define ___DEBUG_PERF___ #ifdef _WIN32 +#include <time.h> #include <winsock.h> // timeval #else #include <pthread.h> +#include <sys/time.h> #endif #include "atomdictbase.h" diff --git a/src/virtualkeyboard/3rdparty/pinyin/share/userdict.cpp b/src/virtualkeyboard/3rdparty/pinyin/share/userdict.cpp index f5f9371b..4687da2d 100644 --- a/src/virtualkeyboard/3rdparty/pinyin/share/userdict.cpp +++ b/src/virtualkeyboard/3rdparty/pinyin/share/userdict.cpp @@ -33,10 +33,6 @@ #include <assert.h> #include <ctype.h> #include <sys/types.h> -#ifndef _WIN32 -#include <sys/time.h> -#endif -#include <time.h> #ifdef _WIN32 #undef max #undef min |