On Wed, May 18, 2011 at 3:56 PM, Gustavo Sverzut Barbieri <[email protected]> wrote: > On Wed, May 18, 2011 at 8:45 AM, Enlightenment SVN > <[email protected]> wrote: >> Log: >> Eina binbuf: Fix compilation and correct the mistakes. >> >> Author: tasn >> Date: 2011-05-18 04:45:32 -0700 (Wed, 18 May 2011) >> New Revision: 59500 >> Trac: http://trac.enlightenment.org/e/changeset/59500 >> >> Modified: >> trunk/eina/src/include/eina_binbuf.h trunk/eina/src/lib/eina_binbuf.c >> trunk/eina/src/lib/eina_private.h >> >> Modified: trunk/eina/src/include/eina_binbuf.h >> =================================================================== >> --- trunk/eina/src/include/eina_binbuf.h 2011-05-18 11:18:08 UTC (rev >> 59499) >> +++ trunk/eina/src/include/eina_binbuf.h 2011-05-18 11:45:32 UTC (rev >> 59500) >> @@ -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. >> >> Modified: trunk/eina/src/lib/eina_binbuf.c >> =================================================================== >> --- trunk/eina/src/lib/eina_binbuf.c 2011-05-18 11:18:08 UTC (rev 59499) >> +++ trunk/eina/src/lib/eina_binbuf.c 2011-05-18 11:45:32 UTC (rev 59500) >> @@ -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"; > > I guess this will still break --enable-amalgamation since you'll have > 2 __STRBUF_MAGIC_STR[]. I guess you mean: > > #define _STRBUF_MAGIC_STR __BINBUF_MAGIC_STR > static const char _STRBUF_MAGIC_STR[] = "Eina Binbuf"; > > (the first line was changed to BIN instead of STR, the second had a _ removed)
Yep, amalgamation was completly broken, but it should be fine now. -- Cedric BAIL ------------------------------------------------------------------------------ What Every C/C++ and Fortran developer Should Know! Read this article and learn how Intel has extended the reach of its next-generation tools to help Windows* and Linux* C/C++ and Fortran developers boost performance applications - including clusters. http://p.sf.net/sfu/intel-dev2devmay _______________________________________________ enlightenment-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
