diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2015-07-22 21:51:48 +0000 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2015-07-22 21:51:48 +0000 |
| commit | 867523f4cc416248c53bfa96f1ac89dff0f1ca31 (patch) | |
| tree | a468511a1567f094e340cbf973120a4b8ab2fd72 /plugins/MirOTR | |
| parent | 3ac7fd602fa012ee8277d005249b246dd2fa4212 (diff) | |
MirOTR: vc2015 compilation fix
git-svn-id: http://svn.miranda-ng.org/main/trunk@14642 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/MirOTR')
| -rw-r--r-- | plugins/MirOTR/Libgcrypt/custom/config.h | 1 | ||||
| -rw-r--r-- | plugins/MirOTR/ekhtml/include/ekhtml_config.h | 1 | ||||
| -rw-r--r-- | plugins/MirOTR/src/entities.cpp | 4 |
3 files changed, 2 insertions, 4 deletions
diff --git a/plugins/MirOTR/Libgcrypt/custom/config.h b/plugins/MirOTR/Libgcrypt/custom/config.h index bee3c5761e..ad237ae4a3 100644 --- a/plugins/MirOTR/Libgcrypt/custom/config.h +++ b/plugins/MirOTR/Libgcrypt/custom/config.h @@ -620,7 +620,6 @@ #include <string.h> #define strdup _strdup #define stricmp _stricmp -#define snprintf _snprintf #ifdef _WIN64 # define __x86_64__ 1 #else diff --git a/plugins/MirOTR/ekhtml/include/ekhtml_config.h b/plugins/MirOTR/ekhtml/include/ekhtml_config.h index 775b8cb2f2..6174cf6025 100644 --- a/plugins/MirOTR/ekhtml/include/ekhtml_config.h +++ b/plugins/MirOTR/ekhtml/include/ekhtml_config.h @@ -98,7 +98,6 @@ #include <string.h> #define strdup _strdup #define stricmp _stricmp -#define snprintf _snprintf #ifdef _WIN64 # define __x86_64__ 1 #else diff --git a/plugins/MirOTR/src/entities.cpp b/plugins/MirOTR/src/entities.cpp index 916bebd608..6a7d0aec1b 100644 --- a/plugins/MirOTR/src/entities.cpp +++ b/plugins/MirOTR/src/entities.cpp @@ -317,7 +317,7 @@ static size_t putc_utf8(unsigned long cp, char *buffer) return 0; } -static _Bool parse_entity(const char *current, char **to, +static int parse_entity(const char *current, char **to, const char **from, size_t maxlen) { const char *end = (const char *)memchr(current, ';', maxlen); @@ -328,7 +328,7 @@ static _Bool parse_entity(const char *current, char **to, char *tail = NULL; errno = 0; - _Bool hex = current[2] == 'x' || current[2] == 'X'; + int hex = current[2] == 'x' || current[2] == 'X'; unsigned long cp = strtoul( current + (hex ? 3 : 2), &tail, hex ? 16 : 10); |