summaryrefslogtreecommitdiff
path: root/src/lib/evil/evil_locale.c
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2019-05-28 11:37:03 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-05-28 11:37:03 -0400
commita21974367ce9337fb599782ae667e6488d2a34d4 (patch)
treedece89dfbf4452a631099f8f5435b9ce01629241 /src/lib/evil/evil_locale.c
parent93909d89e5c77c0b1ae3693b10f4ca89f43fabb5 (diff)
Evil: fix infinite loop with setlocale
Summary: evil_setlocale was defined as setlocale in evil_private.h *before* evil_setlocale, hence evil_setlocale was calling itself. The solution was to not call evil_private.h in evil_locale.c Test Plan: compialtion and elementary_test Reviewers: zmike, raster, cedric Reviewed By: zmike Subscribers: #reviewers, #committers Tags: #efl Maniphest Tasks: T7985 Differential Revision: https://phab.enlightenment.org/D9030
Diffstat (limited to 'src/lib/evil/evil_locale.c')
-rw-r--r--src/lib/evil/evil_locale.c22
1 files changed, 21 insertions, 1 deletions
diff --git a/src/lib/evil/evil_locale.c b/src/lib/evil/evil_locale.c
index a4d056ad93..15610da6a6 100644
--- a/src/lib/evil/evil_locale.c
+++ b/src/lib/evil/evil_locale.c
@@ -6,7 +6,27 @@
6#include <locale.h> 6#include <locale.h>
7#include <errno.h> 7#include <errno.h>
8 8
9#include "evil_private.h" 9#ifndef WIN32_LEAN_AND_MEAN
10# define WIN32_LEAN_AND_MEAN
11#endif
12#include <windows.h>
13#undef WIN32_LEAN_AND_MEAN
14
15#ifdef EAPI
16# undef EAPI
17#endif
18
19#ifdef EFL_BUILD
20# ifdef DLL_EXPORT
21# define EAPI __declspec(dllexport)
22# else
23# define EAPI
24# endif
25#else
26# define EAPI __declspec(dllimport)
27#endif
28
29#include "evil_locale.h" /* LC_MESSAGES */
10 30
11/* 31/*
12 * LOCALE_SISO639LANGNAME and LOCALE_SISO3166CTRYNAME need at least a buffer 32 * LOCALE_SISO639LANGNAME and LOCALE_SISO3166CTRYNAME need at least a buffer