Elm: fix compilation of codegen on Mac and formatting in elm_priv.h

SVN revision: 77220

diff --git a/src/bin/elementary_codegen.c b/src/bin/elementary_codegen.c
index c3a112c..804d979 100644 (file)
--- a/src/bin/elementary_codegen.c
+++ b/src/bin/elementary_codegen.c
@@ -18,6 +18,12 @@
 #include <stdio.h>
 #include <unistd.h>
 
+#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 (file)
--- 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 <libintl.h>
-#define E_(string)    _elm_dgettext(string)
+# include <libintl.h>
+# 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)