From 0c47fa983161b4db0b7bd4105cebae0ddae707c8 Mon Sep 17 00:00:00 2001
From: Vadim Dashevskiy <watcherhd@gmail.com>
Date: Thu, 23 Jul 2015 06:54:15 +0000
Subject: temporary reverted
git-svn-id: http://svn.miranda-ng.org/main/trunk@14647 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
plugins/MirOTR/Libgcrypt/custom/config.h | 1 +
plugins/MirOTR/ekhtml/include/ekhtml_config.h | 1 +
plugins/MirOTR/src/entities.cpp | 4 ++--
3 files changed, 4 insertions(+), 2 deletions(-)
(limited to 'plugins')
diff --git a/plugins/MirOTR/Libgcrypt/custom/config.h b/plugins/MirOTR/Libgcrypt/custom/config.h
index ad237ae4a3..bee3c5761e 100644
--- a/plugins/MirOTR/Libgcrypt/custom/config.h
+++ b/plugins/MirOTR/Libgcrypt/custom/config.h
@@ -620,6 +620,7 @@
#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 6174cf6025..775b8cb2f2 100644
--- a/plugins/MirOTR/ekhtml/include/ekhtml_config.h
+++ b/plugins/MirOTR/ekhtml/include/ekhtml_config.h
@@ -98,6 +98,7 @@
#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 6a7d0aec1b..916bebd608 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 int 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 int parse_entity(const char *current, char **to,
char *tail = NULL;
errno = 0;
- int 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);
--
cgit v1.2.3