From 32a62e761f00f13f80037f34b5ebd27975d62d57 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Sun, 30 Sep 2012 07:15:30 +0000 Subject: [PATCH] Elm: fix compilation of codegen on Mac and formatting in elm_priv.h SVN revision: 77220 --- src/bin/elementary_codegen.c | 6 ++++++ src/lib/elm_priv.h | 30 +++++++++++++++--------------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/bin/elementary_codegen.c b/src/bin/elementary_codegen.c index c3a112c..804d979 100644 --- a/src/bin/elementary_codegen.c +++ b/src/bin/elementary_codegen.c @@ -18,6 +18,12 @@ #include #include +#ifndef ENABLE_NLS +# ifndef libintl_setlocale +# define libintl_setlocale(c, l) +# endif +#endif + static int _log_dom; #define DBG(...) EINA_LOG_DOM_DBG(_log_dom, __VA_ARGS__) #define ERR(...) EINA_LOG_DOM_ERR(_log_dom, __VA_ARGS__) diff --git a/src/lib/elm_priv.h b/src/lib/elm_priv.h index 3c6c031..f2de5ec 100644 --- a/src/lib/elm_priv.h +++ b/src/lib/elm_priv.h @@ -59,22 +59,22 @@ #define DBG(...) EINA_LOG_DOM_DBG(_elm_log_dom, __VA_ARGS__) #ifdef ENABLE_NLS -#include -#define E_(string) _elm_dgettext(string) +# include +# define E_(string) _elm_dgettext(string) #else -#ifndef setlocale -#define setlocale(c, l) -#endif -#ifndef libintl_setlocale -#define libintl_setlocale(c, l) -#endif -#ifndef bindtextdomain -#define bindtextdomain(domain, dir) -#endif -#ifndef libintl_bindtextdomain -#define libintl_bindtextdomain(domain, dir) -#endif -#define E_(string) (string) +# ifndef setlocale +# define setlocale(c, l) +# endif +# ifndef libintl_setlocale +# define libintl_setlocale(c, l) +# endif +# ifndef bindtextdomain +# define bindtextdomain(domain, dir) +# endif +# ifndef libintl_bindtextdomain +# define libintl_bindtextdomain(domain, dir) +# endif +# define E_(string) (string) #endif #define N_(string) (string) -- 2.7.4