allow amalgamation of files, at least symbols don't clash anymore.

more related to amalgamation later.

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/eina@42312 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/eina_array.c b/src/lib/eina_array.c
index d25cbda..873ba0d 100644 (file)
--- a/src/lib/eina_array.c
+++ b/src/lib/eina_array.c
@@ -183,7 +183,15 @@ struct _Eina_Accessor_Array
 };
 
 static int _eina_array_log_dom = -1;
+
+#ifdef ERR
+#undef ERR
+#endif
 #define ERR(...) EINA_LOG_DOM_ERR(_eina_array_log_dom, __VA_ARGS__)
+
+#ifdef DBG
+#undef DBG
+#endif
 #define DBG(...) EINA_LOG_DOM_DBG(_eina_array_log_dom, __VA_ARGS__)
 
 static void eina_array_iterator_free(Eina_Iterator_Array *it) EINA_ARG_NONNULL(1);

diff --git a/src/lib/eina_benchmark.c b/src/lib/eina_benchmark.c
index 60ce4f9..c0c4bbd 100644 (file)
--- a/src/lib/eina_benchmark.c
+++ b/src/lib/eina_benchmark.c
@@ -91,10 +91,17 @@ struct _Eina_Benchmark
    Eina_Inlist *runs;
 };
 
-static int _log_dom = -1;
+static int _eina_benchmark_log_dom = -1;
 
-#define ERR(...) EINA_LOG_DOM_ERR(_log_dom, __VA_ARGS__)
-#define DBG(...) EINA_LOG_DOM_DBG(_log_dom, __VA_ARGS__)
+#ifdef ERR
+#undef ERR
+#endif
+#define ERR(...) EINA_LOG_DOM_ERR(_eina_benchmark_log_dom, __VA_ARGS__)
+
+#ifdef DBG
+#undef DBG
+#endif
+#define DBG(...) EINA_LOG_DOM_DBG(_eina_benchmark_log_dom, __VA_ARGS__)
 
 /**
  * @endcond
@@ -149,8 +156,8 @@ static int _log_dom = -1;
 Eina_Bool
 eina_benchmark_init(void)
 {
-   _log_dom = eina_log_domain_register("eina_benchmark", EINA_LOG_COLOR_DEFAULT);
-   if (_log_dom < 0)
+   _eina_benchmark_log_dom = eina_log_domain_register("eina_benchmark", EINA_LOG_COLOR_DEFAULT);
+   if (_eina_benchmark_log_dom < 0)
      {
        EINA_LOG_ERR("Could not register log domain: eina_benchmark");
        return EINA_FALSE;
@@ -173,8 +180,8 @@ eina_benchmark_init(void)
 Eina_Bool
 eina_benchmark_shutdown(void)
 {
-   eina_log_domain_unregister(_log_dom);
-   _log_dom = -1;
+   eina_log_domain_unregister(_eina_benchmark_log_dom);
+   _eina_benchmark_log_dom = -1;
    return EINA_TRUE;
 }
 

diff --git a/src/lib/eina_convert.c b/src/lib/eina_convert.c
index 120ec01..4f095ec 100644 (file)
--- a/src/lib/eina_convert.c
+++ b/src/lib/eina_convert.c
@@ -46,7 +46,14 @@ static const char look_up_table[] = {'0', '1', '2', '3', '4',
                                     'a', 'b', 'c', 'd', 'e', 'f'};
 static int _eina_convert_log_dom = -1;
 
+#ifdef ERR
+#undef ERR
+#endif
 #define ERR(...) EINA_LOG_DOM_ERR(_eina_convert_log_dom, __VA_ARGS__)
+
+#ifdef DBG
+#undef DBG
+#endif
 #define DBG(...) EINA_LOG_DOM_DBG(_eina_convert_log_dom, __VA_ARGS__)
 
 #define HEXA_TO_INT(Hexa) (Hexa >= 'a') ? Hexa - 'a' + 10 : Hexa - '0'

diff --git a/src/lib/eina_list.c b/src/lib/eina_list.c
index e9aa0f8..337ec35 100644 (file)
--- a/src/lib/eina_list.c
+++ b/src/lib/eina_list.c
@@ -163,7 +163,14 @@ static Eina_Mempool *_eina_list_mp = NULL;
 static Eina_Mempool *_eina_list_accounting_mp = NULL;
 static int _eina_list_log_dom = -1;
 
+#ifdef ERR
+#undef ERR
+#endif
 #define ERR(...) EINA_LOG_DOM_ERR(_eina_list_log_dom, __VA_ARGS__)
+
+#ifdef DBG
+#undef DBG
+#endif
 #define DBG(...) EINA_LOG_DOM_DBG(_eina_list_log_dom, __VA_ARGS__)
 
 static inline Eina_List_Accounting*

diff --git a/src/lib/eina_magic.c b/src/lib/eina_magic.c
index 20fde81..ea291bc 100644 (file)
--- a/src/lib/eina_magic.c
+++ b/src/lib/eina_magic.c
@@ -54,7 +54,14 @@ struct _Eina_Magic_String
 
 static int _eina_magic_string_log_dom = -1;
 
+#ifdef ERR
+#undef ERR
+#endif
 #define ERR(...) EINA_LOG_DOM_ERR(_eina_magic_string_log_dom, __VA_ARGS__)
+
+#ifdef DBG
+#undef DBG
+#endif
 #define DBG(...) EINA_LOG_DOM_DBG(_eina_magic_string_log_dom, __VA_ARGS__)
 
 static Eina_Magic_String *_eina_magic_strings = NULL;

diff --git a/src/lib/eina_main.c b/src/lib/eina_main.c
index d39da42..a75631a 100644 (file)
--- a/src/lib/eina_main.c
+++ b/src/lib/eina_main.c
@@ -49,7 +49,15 @@
 
 static int _eina_main_count = 0;
 static int _eina_log_dom = -1;
+
+#ifdef ERR
+#undef ERR
+#endif
 #define ERR(...) EINA_LOG_DOM_ERR(_eina_log_dom, __VA_ARGS__)
+
+#ifdef DBG
+#undef DBG
+#endif
 #define DBG(...) EINA_LOG_DOM_DBG(_eina_log_dom, __VA_ARGS__)
 
 

diff --git a/src/lib/eina_matrixsparse.c b/src/lib/eina_matrixsparse.c
index bf7fe43..6d9d095 100644 (file)
--- a/src/lib/eina_matrixsparse.c
+++ b/src/lib/eina_matrixsparse.c
@@ -197,7 +197,14 @@ struct _Eina_Matrixsparse_Iterator_Complete
 
 static int _eina_matrixsparse_log_dom = -1;
 
+#ifdef ERR
+#undef ERR
+#endif
 #define ERR(...) EINA_LOG_DOM_ERR(_eina_matrixsparse_log_dom, __VA_ARGS__)
+
+#ifdef DBG
+#undef DBG
+#endif
 #define DBG(...) EINA_LOG_DOM_DBG(_eina_matrixsparse_log_dom, __VA_ARGS__)
 
 static Eina_Mempool *_eina_matrixsparse_cell_mp = NULL;

diff --git a/src/lib/eina_mempool.c b/src/lib/eina_mempool.c
index 6e44cbf..71784a5 100644 (file)
--- a/src/lib/eina_mempool.c
+++ b/src/lib/eina_mempool.c
@@ -46,10 +46,17 @@
 
 static Eina_Hash *_backends;
 static Eina_Array *_modules;
-static int _log_dom = -1;
+static int _eina_mempool_log_dom = -1;
 
-#define ERR(...) EINA_LOG_DOM_ERR(_log_dom, __VA_ARGS__)
-#define DBG(...) EINA_LOG_DOM_DBG(_log_dom, __VA_ARGS__)
+#ifdef ERR
+#undef ERR
+#endif
+#define ERR(...) EINA_LOG_DOM_ERR(_eina_mempool_log_dom, __VA_ARGS__)
+
+#ifdef DBG
+#undef DBG
+#endif
+#define DBG(...) EINA_LOG_DOM_DBG(_eina_mempool_log_dom, __VA_ARGS__)
 
 
 static Eina_Mempool *
@@ -151,8 +158,8 @@ eina_mempool_init(void)
 {
    char *path;
 
-   _log_dom = eina_log_domain_register("eina_mempool", EINA_LOG_COLOR_DEFAULT);
-   if (_log_dom < 0)
+   _eina_mempool_log_dom = eina_log_domain_register("eina_mempool", EINA_LOG_COLOR_DEFAULT);
+   if (_eina_mempool_log_dom < 0)
      {
        EINA_LOG_ERR("Could not register log domain: eina_mempool");
        return 0;
@@ -203,8 +210,8 @@ eina_mempool_init(void)
    return EINA_TRUE;
 
  mempool_init_error:
-   eina_log_domain_unregister(_log_dom);
-   _log_dom = -1;
+   eina_log_domain_unregister(_eina_mempool_log_dom);
+   _eina_mempool_log_dom = -1;
 
    return EINA_FALSE;
 }
@@ -236,8 +243,8 @@ eina_mempool_shutdown(void)
    if (_backends)
      eina_hash_free(_backends);
 
-   eina_log_domain_unregister(_log_dom);
-   _log_dom = -1;
+   eina_log_domain_unregister(_eina_mempool_log_dom);
+   _eina_mempool_log_dom = -1;
 
    return EINA_TRUE;
 }

diff --git a/src/lib/eina_module.c b/src/lib/eina_module.c
index 3bf36d4..fe87de0 100644 (file)
--- a/src/lib/eina_module.c
+++ b/src/lib/eina_module.c
@@ -71,8 +71,19 @@ void *alloca (size_t);
  */
 
 static int EINA_MODULE_LOG_DOM = -1;
+#ifdef ERR
+#undef ERR
+#endif
 #define ERR(...) EINA_LOG_DOM_ERR(EINA_MODULE_LOG_DOM, __VA_ARGS__)
+
+#ifdef WRN
+#undef WRN
+#endif
 #define WRN(...) EINA_LOG_DOM_WARN(EINA_MODULE_LOG_DOM, __VA_ARGS__)
+
+#ifdef DBG
+#undef DBG
+#endif
 #define DBG(...) EINA_LOG_DOM_DBG(EINA_MODULE_LOG_DOM, __VA_ARGS__)
 
 #if defined(_WIN32) || defined(__CYGWIN__)

diff --git a/src/lib/eina_rectangle.c b/src/lib/eina_rectangle.c
index f167463..e2d8466 100644 (file)
--- a/src/lib/eina_rectangle.c
+++ b/src/lib/eina_rectangle.c
@@ -93,7 +93,14 @@ static Eina_Trash *_eina_rectangles = NULL;
 static unsigned int _eina_rectangles_count = 0;
 static int _eina_rectangle_log_dom = -1;
 
+#ifdef ERR
+#undef ERR
+#endif
 #define ERR(...) EINA_LOG_DOM_ERR(_eina_rectangle_log_dom, __VA_ARGS__)
+
+#ifdef DBG
+#undef DBG
+#endif
 #define DBG(...) EINA_LOG_DOM_DBG(_eina_rectangle_log_dom, __VA_ARGS__)
 
 static int

diff --git a/src/lib/eina_stringshare.c b/src/lib/eina_stringshare.c
index 4ab4b99..50c3f86 100644 (file)
--- a/src/lib/eina_stringshare.c
+++ b/src/lib/eina_stringshare.c
@@ -155,8 +155,19 @@ struct _Eina_Stringshare_Head
 static Eina_Stringshare *share = NULL;
 static int _eina_stringshare_log_dom = -1;
 
+#ifdef CRITICAL
+#undef CRITICAL
+#endif
 #define CRITICAL(...) EINA_LOG_DOM_CRIT(_eina_stringshare_log_dom, __VA_ARGS__)
+
+#ifdef ERR
+#undef ERR
+#endif
 #define ERR(...) EINA_LOG_DOM_ERR(_eina_stringshare_log_dom, __VA_ARGS__)
+
+#ifdef DBG
+#undef DBG
+#endif
 #define DBG(...) EINA_LOG_DOM_DBG(_eina_stringshare_log_dom, __VA_ARGS__)
 
 static const unsigned char _eina_stringshare_single[512] = {