diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-20 21:17:36 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-20 21:17:36 +0000 |
| commit | 56e7b7eaede52e8d2123e909d7d42220f8c63143 (patch) | |
| tree | 73e1dc4b2e53d68c3a9d5269f9140142ef08c187 /mysys/my_conio.c | |
| parent | 9d97e6010ebdeab0579a8371d01f34118c518b30 (diff) | |
| download | mariadb-git-56e7b7eaede52e8d2123e909d7d42220f8c63143.tar.gz | |
Make possible to use clang on Windows (clang-cl)
-DWITH_ASAN can be used as well now, on x64
Fix many clang-cl warnings.
Diffstat (limited to 'mysys/my_conio.c')
| -rw-r--r-- | mysys/my_conio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/my_conio.c b/mysys/my_conio.c index 0af5706cace..21f30bd9b67 100644 --- a/mysys/my_conio.c +++ b/mysys/my_conio.c @@ -47,7 +47,7 @@ static HANDLE my_coninpfh= 0; /* console input */ static int my_pthread_auto_mutex_lock(HANDLE* ph, const char* name, int id, int time) { - int res; + DWORD res; char tname[FN_REFLEN]; sprintf(tname, "%s-%08X", name, id); @@ -203,7 +203,7 @@ char* my_cgets(char *buffer, size_t clen, size_t* plen) if (*plen > 0 && buffer[*plen - 1] == '\r') { char tmp[3]; - int tmplen= sizeof(tmp); + DWORD tmplen= (DWORD)sizeof(tmp); *plen= *plen - 1; /* read /n left in the buffer */ |