From 371c87af33810c934034161947c143ccbf6aa01b Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 23 Jul 2015 08:28:34 +0000 Subject: various warning & compilation fixes git-svn-id: http://svn.miranda-ng.org/main/trunk@14648 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/MirOTR/src/entities.cpp | 4 ++-- plugins/MirOTR/src/stdafx.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'plugins/MirOTR/src') diff --git a/plugins/MirOTR/src/entities.cpp b/plugins/MirOTR/src/entities.cpp index 916bebd608..f049ad0b88 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 bool 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'; + bool hex = current[2] == 'x' || current[2] == 'X'; unsigned long cp = strtoul( current + (hex ? 3 : 2), &tail, hex ? 16 : 10); diff --git a/plugins/MirOTR/src/stdafx.h b/plugins/MirOTR/src/stdafx.h index b675f3314c..4d1be59d91 100644 --- a/plugins/MirOTR/src/stdafx.h +++ b/plugins/MirOTR/src/stdafx.h @@ -7,7 +7,7 @@ #define _CRT_NON_CONFORMING_SWPRINTFS #define _CRT_SECURE_NO_WARNINGS -#define WIN32_LEAN_AND_MEAN // Selten verwendete Teile der Windows-Header nicht einbinden. +#define WIN32_LEAN_AND_MEAN #include #include -- cgit v1.2.3