i forgot about amalgamation. fix declaration too

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/eina@51243 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 9fc3df6..7df3b72 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -122,6 +122,7 @@ eina_amalgamation.c: $(base_sources) Makefile
        @echo "#include \"eina_private.h\"" >> eina_amalgamation.c
        @echo "#include \"eina_safety_checks.h\"" >> eina_amalgamation.c
        @echo "#include \"Eina.h\"" >> eina_amalgamation.c
+       @echo "#include \"eina_strbuf_common.h\"" >> eina_amalgamation.c
        @echo "#include \"eina_share_common.h\"" >> eina_amalgamation.c
 
        @for f in $(base_sources); do \

diff --git a/src/lib/eina_strbuf.c b/src/lib/eina_strbuf.c
index 5ffcc42..519695f 100644 (file)
--- a/src/lib/eina_strbuf.c
+++ b/src/lib/eina_strbuf.c
@@ -20,6 +20,39 @@
  * @cond LOCAL
  */
 
+#ifdef _STRBUF_DATA_TYPE
+# undef _STRBUF_DATA_TYPE
+#endif
+
+#ifdef _STRBUF_CSIZE
+# undef _STRBUF_CSIZE
+#endif
+
+#ifdef _STRBUF_STRUCT_NAME
+# undef _STRBUF_STRUCT_NAME
+#endif
+
+#ifdef _STRBUF_STRLEN_FUNC
+# undef _STRBUF_STRLEN_FUNC
+#endif
+
+#ifdef _STRBUF_STRESCAPE_FUNC
+# undef _STRBUF_STRESCAPE_FUNC
+#endif
+
+#ifdef _STRBUF_MAGIC
+# undef _STRBUF_MAGIC
+#endif
+
+#ifdef _STRBUF_MAGIC_STR
+# undef _STRBUF_MAGIC_STR
+#endif
+
+#ifdef _FUNC_EXPAND
+# undef _FUNC_EXPAND
+#endif
+
+
 #define _STRBUF_DATA_TYPE         char
 #define _STRBUF_CSIZE             sizeof(_STRBUF_DATA_TYPE)
 #define _STRBUF_STRUCT_NAME       Eina_Strbuf

diff --git a/src/lib/eina_strbuf_common.c b/src/lib/eina_strbuf_common.c
index 2dbecf7..eee3323 100644 (file)
--- a/src/lib/eina_strbuf_common.c
+++ b/src/lib/eina_strbuf_common.c
@@ -673,6 +673,18 @@ eina_strbuf_common_length_get(const Eina_Strbuf *buf)
 
 /*FIXME: Implementing them here is a hack! */
 
+#ifdef _STRBUF_CSIZE
+# undef _STRBUF_CSIZE
+#endif
+
+#ifdef _STRBUF_MAGIC
+# undef _STRBUF_MAGIC
+#endif
+
+#ifdef _STRBUF_MAGIC_STR
+# undef _STRBUF_MAGIC_STR
+#endif
+
 #define _STRBUF_CSIZE 1
 #define _STRBUF_MAGIC             EINA_MAGIC_STRBUF
 #define _STRBUF_MAGIC_STR         __STRBUF_STR_MAGIC_STR

diff --git a/src/lib/eina_ustrbuf.c b/src/lib/eina_ustrbuf.c
index 4a38ee8..7df5b16 100644 (file)
--- a/src/lib/eina_ustrbuf.c
+++ b/src/lib/eina_ustrbuf.c
@@ -14,6 +14,38 @@
  * @cond LOCAL
  */
 
+#ifdef _STRBUF_DATA_TYPE
+# undef _STRBUF_DATA_TYPE
+#endif
+
+#ifdef _STRBUF_CSIZE
+# undef _STRBUF_CSIZE
+#endif
+
+#ifdef _STRBUF_STRUCT_NAME
+# undef _STRBUF_STRUCT_NAME
+#endif
+
+#ifdef _STRBUF_STRLEN_FUNC
+# undef _STRBUF_STRLEN_FUNC
+#endif
+
+#ifdef _STRBUF_STRESCAPE_FUNC
+# undef _STRBUF_STRESCAPE_FUNC
+#endif
+
+#ifdef _STRBUF_MAGIC
+# undef _STRBUF_MAGIC
+#endif
+
+#ifdef _STRBUF_MAGIC_STR
+# undef _STRBUF_MAGIC_STR
+#endif
+
+#ifdef _FUNC_EXPAND
+# undef _FUNC_EXPAND
+#endif
+
 #define _STRBUF_DATA_TYPE         Eina_Unicode
 #define _STRBUF_CSIZE             sizeof(_STRBUF_DATA_TYPE)
 #define _STRBUF_STRUCT_NAME       Eina_UStrbuf