Eina binbuf: Fix compilation and correct the mistakes.

SVN revision: 59500

diff --git a/legacy/eina/src/include/eina_binbuf.h b/legacy/eina/src/include/eina_binbuf.h
index 910cade4c00acd2b35f7566a825a7e9348e7cfdf..4e2cfdd7372b716f87361e4b82fce06849459770 100644 (file)
--- a/legacy/eina/src/include/eina_binbuf.h
+++ b/legacy/eina/src/include/eina_binbuf.h
@@ -33,7 +33,7 @@
  * @typedef Eina_Binbuf
  * Type for a string buffer.
  */
-typedef struct _Eina_Binbuf Eina_Binbuf;
+typedef struct _Eina_Strbuf Eina_Binbuf;
 
 /**
  * @brief Create a new string buffer.

diff --git a/legacy/eina/src/lib/eina_binbuf.c b/legacy/eina/src/lib/eina_binbuf.c
index 2a4cd4691b9ea205555169a7d5cb5c86a72ae9fa..8993aa4db77c29883ec8e6765e48c232d324490d 100644 (file)
--- a/legacy/eina/src/lib/eina_binbuf.c
+++ b/legacy/eina/src/lib/eina_binbuf.c
@@ -10,9 +10,8 @@
 #endif
 
 #include "eina_private.h"
-#include "eina_str.h"
 #include "eina_strbuf_common.h"
-#include "eina_unicode.h"
+#include "eina_binbuf.h"
 
 /*============================================================================*
  *                                  Local                                     *
@@ -50,7 +49,7 @@
 #define _STRBUF_DATA_TYPE         char
 #define _STRBUF_CSIZE             sizeof(_STRBUF_DATA_TYPE)
 #define _STRBUF_STRUCT_NAME       Eina_Binbuf
-#define _STRBUF_MAGIC             EINA_MAGIC_STRBUF
+#define _STRBUF_MAGIC             EINA_MAGIC_BINBUF
 #define _STRBUF_MAGIC_STR         __STRBUF_MAGIC_STR
 static const char __STRBUF_MAGIC_STR[] = "Eina Binbuf";
 

diff --git a/legacy/eina/src/lib/eina_private.h b/legacy/eina/src/lib/eina_private.h
index 7e500f5bdf131b6dcacbf2ade06ffd88b080505e..936060e26b326b7d5c1a9064631a3ae56424f70e 100644 (file)
--- a/legacy/eina/src/lib/eina_private.h
+++ b/legacy/eina/src/lib/eina_private.h
@@ -85,6 +85,7 @@
 
 #define EINA_MAGIC_STRBUF 0x98761250
 #define EINA_MAGIC_USTRBUF 0x98761257
+#define EINA_MAGIC_BINBUF 0x98761258
 
 #define EINA_MAGIC_QUADTREE 0x98761251
 #define EINA_MAGIC_QUADTREE_ROOT 0x98761252