From f1ca8b54d6f51d0eab01e29e47c3f28d5056aa60 Mon Sep 17 00:00:00 2001
From: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Date: Thu, 10 Jan 2013 20:25:53 +0000
Subject: [PATCH] efl: remove check for langinfo.h and locale.h

SVN revision: 82583
---
 configure.ac                |  2 --
 src/lib/ecore/ecore.c       | 11 ++---------
 src/lib/edje/edje_edit.c    |  2 --
 src/lib/edje/edje_private.h | 12 +++---------
 4 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/configure.ac b/configure.ac
index 43d5181210..c6d5aba85c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1820,8 +1820,6 @@ AC_HEADER_SYS_WAIT
 
 AC_CHECK_HEADERS([ \
 features.h \
-langinfo.h \
-locale.h \
 sys/time.h \
 sys/prctl.h \
 sys/resource.h \
diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index eb306408b3..5c9ad0cd28 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -2,6 +2,7 @@
 # include <config.h>
 #endif
 
+#include <locale.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <sys/types.h>
@@ -10,13 +11,7 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#ifdef HAVE_LOCALE_H
-# include <locale.h>
-#endif
-
-#ifdef HAVE_LANGINFO_H
-# include <langinfo.h>
-#endif
+#include <langinfo.h>
 
 #ifdef HAVE_SYS_MMAN_H
 # include <sys/mman.h>
@@ -140,9 +135,7 @@ ecore_init(void)
 
    eo_init();
 
-#ifdef HAVE_LOCALE_H
    setlocale(LC_CTYPE, "");
-#endif
    /*
       if (strcmp(nl_langinfo(CODESET), "UTF-8"))
       {
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index 437e6aa77b..dea54665f5 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -2817,9 +2817,7 @@ edje_edit_part_states_list_get(Evas_Object *obj, const char *part)
    GET_RP_OR_RETURN(NULL);
 
    //Is there a better place to put this? maybe edje_edit_init() ?
-#ifdef HAVE_LOCALE_H
    setlocale(LC_NUMERIC, "C");
-#endif
 
    states = NULL;
 
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index ad01a844ce..9bc4c78964 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -14,17 +14,15 @@
 # endif
 #endif
 
+#include <locale.h>
+#include <libgen.h>
 #include <string.h>
 #include <limits.h>
 #include <sys/stat.h>
 #include <time.h>
 #include <sys/time.h>
 #include <errno.h>
-
-#ifndef _MSC_VER
-# include <libgen.h>
-# include <unistd.h>
-#endif
+#include <unistd.h>
 
 #include <fcntl.h>
 
@@ -33,10 +31,6 @@
 #include <lauxlib.h>
 #include <setjmp.h>
 
-#ifdef HAVE_LOCALE_H
-# include <locale.h>
-#endif
-
 #ifdef HAVE_EVIL
 # include <Evil.h>
 #endif