On Wed, May 18, 2011 at 8:45 AM, Enlightenment SVN <no-re...@enlightenment.org> 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) > > > Modified: trunk/eina/src/lib/eina_private.h > =================================================================== > --- trunk/eina/src/lib/eina_private.h 2011-05-18 11:18:08 UTC (rev 59499) > +++ trunk/eina/src/lib/eina_private.h 2011-05-18 11:45:32 UTC (rev 59500) > @@ -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 > > > ------------------------------------------------------------------------------ > 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-svn mailing list > enlightenment-...@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn > -- Gustavo Sverzut Barbieri http://profusion.mobi embedded systems -------------------------------------- MSN: barbi...@gmail.com Skype: gsbarbieri Mobile: +55 (19) 9225-2202 ------------------------------------------------------------------------------ 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 enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
