[E-devel] [PATCH 2/2] ecore/configure: fix ECORE_CHECK_TSLIB
The code was setting _ecore_have_ts but checking _ecore_have_tslib. Signed-off-by: Marc Andre Tanner m...@brain-dump.org --- m4/ecore_check_options.m4 | 10 +- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/m4/ecore_check_options.m4 b/m4/ecore_check_options.m4 index 03aa740..b8c6db8 100644 --- a/m4/ecore_check_options.m4 +++ b/m4/ecore_check_options.m4 @@ -198,12 +198,12 @@ if test x${_ecore_want_tslib} = xyes -o x${_ecore_want_tslib} = xauto ; PKG_CHECK_MODULES(TSLIB, tslib-1.0, [ AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_FB Touchscreen Code]) - _ecore_have_ts=yes + _ecore_have_tslib=yes ],[ PKG_CHECK_MODULES(TSLIB, tslib, [ AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_FB Touchscreen Code]) - _ecore_have_ts=yes + _ecore_have_tslib=yes ],[ AC_CHECK_HEADER([tslib.h], [ @@ -212,16 +212,16 @@ if test x${_ecore_want_tslib} = xyes -o x${_ecore_want_tslib} = xauto ; TSLIB_LIBS=-lts TSLIB_CFLAGS= AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_FB Touchscreen Code]) - _ecore_have_ts=yes + _ecore_have_tslib=yes ],[ AC_CHECK_LIB([tslib], [ts_open], [ TSLIB_LIBS=-ltslib TSLIB_CFLAGS= AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_FB Touchscreen Code]) - _ecore_have_ts=yes + _ecore_have_tslib=yes ],[ - _ecore_have_ts=no + _ecore_have_tslib=no ]) ]) ]) -- 1.6.3.3 -- Come build with us! The BlackBerryreg; Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9#45;12, 2009. Register now#33; http://p.sf.net/sfu/devconf ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] [PATCH 1/2] ecore/configure: fix usage of ECORE_CHECK_TSLIB (touchscreen detection)
Signed-off-by: Marc Andre Tanner m...@brain-dump.org --- configure.ac |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 87abb8f..999a333 100644 --- a/configure.ac +++ b/configure.ac @@ -877,7 +877,7 @@ ECORE_CHECK_MODULE([SDL], [${want_ecore_sdl}], [${ecore_sdl_deps}], ECORE_CHECK_MODULE([FB], [${want_ecore_fb}], [$have_fb]) if test x${have_ecore_fb} = xyes ; then - ECORE_CHECK_TSLIB([${want_tslib}], [have_tslib=no], [have_tslib=no]) + ECORE_CHECK_TSLIB([${want_tslib}], [have_tslib=yes], [have_tslib=no]) fi # ecore_directfb -- 1.6.3.3 -- Come build with us! The BlackBerryreg; Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9#45;12, 2009. Register now#33; http://p.sf.net/sfu/devconf ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] [PATCH] ecore: fix tslib touchscreen detection
Hi, I am trying to compile just the minimum requirements for elementary with framebuffer support. During this I found some problems in ecore's tslib detection code. The following patches should fix them. [ Note: I am in no way an expert - and don't want to become one - in configure and autohell teritory. The patches were created by looking around for similar constructs in the rest of the code. I hope they are ok, at least they seem to work for me. ] Marc -- Marc Andre Tanner http://www.brain-dump.org/ GPG key: CF7D56C0 -- Come build with us! The BlackBerryreg; Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9#45;12, 2009. Register now#33; http://p.sf.net/sfu/devconf ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] Elementary with framebuffer backend font question
Hi, I am trying to build a minimal elementary with framebuffer backend based initramfs for my Freerunner. I so far cross compiled all the required elementary dependencies and tested the result in a chroot with the dialog app from the elementary wiki page. The app starts up but all fonts are missing which makes sense since I haven't yet copied any into the chroot. Unfortunately I don't really know how the font handling is supposed to work with the framebuffer backend (I disabled fontconfig support at compile time). I then took a look at the default elementary theme and saw that it specifys Sans as default font, is this correct so far? I then did: export ELM_ENGINE=fb export ELM_FONT_PATH=/usr/share/fonts strace -f -e trace=file -o log dialog This is a test This showed that it tried to open the files fonts.dir and fonts.alias in /usr/share/fonts. Did some google search about these and then copied the the truetype fonts from my normal SHR system to the host. On the host I executed: ttmkfdir mkfontdir which generated a fonts.scale (which didn't who up under strace so I ingored it for now) and a fonts.dir file. This looks like this: ... DejaVuSans.ttf -misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-ascii-0 DejaVuSans.ttf -misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-iso10646-1 DejaVuSans.ttf -misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-iso8859-1 DejaVuSans.ttf -misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-iso8859-10 DejaVuSans.ttf -misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-iso8859-13 DejaVuSans.ttf -misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-iso8859-15 DejaVuSans.ttf -misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-iso8859-2 DejaVuSans.ttf -misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-iso8859-3 DejaVuSans.ttf -misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-iso8859-4 DejaVuSans.ttf -misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-iso8859-5 DejaVuSans.ttf -misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-iso8859-6 DejaVuSans.ttf -misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-iso8859-7 DejaVuSans.ttf -misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-iso8859-8 DejaVuSans.ttf -misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-iso8859-9 DejaVuSans.ttf -misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-koi8-r DejaVuSans.ttf -misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-koi8-ru ... I then created a fonts.alias file with the following content (are the fonts case sensitive?): default -misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-ascii-0 Sans-misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-ascii-0 sans-misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-ascii-0 and copied everything to /usr/share/fonts into my chroot. Unfortunately the dialog app didn't pick up the fonts and strace showed that it now tries to acces /usr/share/elementary/themes/default.edj/Sans which doesn't exists. Could anyone explain me how to correctly configure my fonts for a framebuffer environment so that elementary can use them? Thanks, Marc -- Marc Andre Tanner http://www.brain-dump.org/ GPG key: CF7D56C0 -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Elementary with framebuffer backend font question
On Wed, Oct 07, 2009 at 10:46:23PM +1100, Carsten Haitzler wrote: On Wed, 7 Oct 2009 12:22:08 +0200 Marc Andre Tanner m...@brain-dump.org said: the default theme uses Sans font by default - via fontconfig. you'e missing a Sans alias that works. beats me as to the details. install x and you should get the sans aliases set up. I want to avoid X if possible. The resulting initramfs should be as small as possible. Does anybody know how to correctly set up the Sans alias? Marc -- Marc Andre Tanner http://www.brain-dump.org/ GPG key: CF7D56C0 -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Elementary with framebuffer backend font question
After reading through evas_font_dir.c I found the solution (see below). On Wed, Oct 07, 2009 at 12:22:08PM +0200, Marc Andre Tanner wrote: Hi, I am trying to build a minimal elementary with framebuffer backend based initramfs for my Freerunner. I so far cross compiled all the required elementary dependencies and tested the result in a chroot with the dialog app from the elementary wiki page. The app starts up but all fonts are missing which makes sense since I haven't yet copied any into the chroot. Unfortunately I don't really know how the font handling is supposed to work with the framebuffer backend (I disabled fontconfig support at compile time). I then took a look at the default elementary theme and saw that it specifys Sans as default font, is this correct so far? I then did: export ELM_ENGINE=fb export ELM_FONT_PATH=/usr/share/fonts strace -f -e trace=file -o log dialog This is a test This showed that it tried to open the files fonts.dir and fonts.alias in /usr/share/fonts. Did some google search about these and then copied the the truetype fonts from my normal SHR system to the host. On the host I executed: ttmkfdir mkfontdir which generated a fonts.scale (which didn't who up under strace so I ingored it for now) and a fonts.dir file. This looks like this: ... DejaVuSans.ttf -misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-ascii-0 DejaVuSans.ttf -misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-iso10646-1 DejaVuSans.ttf -misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-iso8859-1 DejaVuSans.ttf -misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-iso8859-10 DejaVuSans.ttf -misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-iso8859-13 DejaVuSans.ttf -misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-iso8859-15 DejaVuSans.ttf -misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-iso8859-2 DejaVuSans.ttf -misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-iso8859-3 DejaVuSans.ttf -misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-iso8859-4 DejaVuSans.ttf -misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-iso8859-5 DejaVuSans.ttf -misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-iso8859-6 DejaVuSans.ttf -misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-iso8859-7 DejaVuSans.ttf -misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-iso8859-8 DejaVuSans.ttf -misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-iso8859-9 DejaVuSans.ttf -misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-koi8-r DejaVuSans.ttf -misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-koi8-ru ... I then created a fonts.alias file with the following content (are the fonts case sensitive?): default -misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-ascii-0 Sans-misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-ascii-0 sans-misc-dejavu sans-medium-r-normal--0-0-0-0-c-0-ascii-0 ^ The space at the end of the line actually was the problem. Because of this the last component didn't match '0 ' != '0' and evas dropped the alias. Maybe all trailing white spaces should be stripped? Another possibly simpler solution which also seems to work is a symlink ln -s DejaVuSans.ttf Sans.ttf evas then uses the filename without the extension as font name. This way there is no need for the fonts.alias and fonts.dir files. Marc -- Marc Andre Tanner http://www.brain-dump.org/ GPG key: CF7D56C0 -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Elementary with framebuffer backend font question
On Fri, Oct 09, 2009 at 01:14:45AM +1100, Carsten Haitzler wrote: On Thu, 8 Oct 2009 15:47:25 +0200 Michael 'Mickey' Lauer mic...@vanille-media.de said: Raster, X may not be big our bloated, but would you please stop pretending you know all usecases people will ever have? There _are_ usecases for plain framebuffer. very very very few cases. even if all you want is 1 process fullscreen, x will provide portable infrasturcture. if the reason is size, then it's a pretty specious position considering how small x can really be (compared to everything else). This should eventually become a graphical boot menu for Qi. So yes it basically is just one fullscreen process. Give me some numbers, how small can X really be? On my SHR Xfbdev/Xglamo without all libraries and data files are both about ~1MB which is pretty large given that my whole initramfs is about 4-5MB. but hey! i don't see you coming to his rescue and giving him a fontconfig setup. at least i suggested something that would work and get him fonts. very x package install i have come across has also set up Sans for fontconfig. it will do the job. I agree that X provides a kind of standard environment. But the most comfortable way is not always the best one. And moreover doing things in an non-standard way is fun. Marc -- Marc Andre Tanner http://www.brain-dump.org/ GPG key: CF7D56C0 -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] [PATCH] ecore-file: don't use ecore-con if it is disabled
This makes ecore-file useable without ecore-con. Signed-off-by: Marc Andre Tanner m...@brain-dump.org --- src/lib/ecore_file/ecore_file_download.c | 16 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/src/lib/ecore_file/ecore_file_download.c b/src/lib/ecore_file/ecore_file_download.c index a46fce9..17c43ae 100644 --- a/src/lib/ecore_file/ecore_file_download.c +++ b/src/lib/ecore_file/ecore_file_download.c @@ -14,6 +14,8 @@ #define ECORE_MAGIC_FILE_DOWNLOAD_JOB 0xf7427cb8 +#ifdef BUILD_ECORE_CON + typedef struct _Ecore_File_Download_JobEcore_File_Download_Job; struct _Ecore_File_Download_Job { @@ -282,3 +284,17 @@ _ecore_file_download_abort(Ecore_File_Download_Job *job) free(job-dst); free(job); } + +#else +int +ecore_file_download_init(void) +{ + return 1; +} + +void +ecore_file_download_shutdown(void) +{ + +} +#endif /* BUILD_ECORE_CON */ -- 1.6.4.3 -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [PATCH] ecore-file: don't use ecore-con if it is disabled
On Sun, Oct 11, 2009 at 11:43:50PM +0200, Vincent Torri wrote: On Sun, 11 Oct 2009, Marc Andre Tanner wrote: This makes ecore-file useable without ecore-con. better one : http://pastebin.ca/1613582 Why do you think this one is better? It clutters the source with more #ifdef's and if you add a new function you will have to remember to add the check for BUILD_ECORE_CON. Anyway whoever maintains the code should decide which solution he prefers. is it working for you ? No, it breaks the build on the first use of EAPI which is probably undefined because you moved the first #ifdef before the inclusion of ecore_file_private.h Marc -- Marc Andre Tanner http://www.brain-dump.org/ GPG key: CF7D56C0 -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [PATCH] ecore-file: don't use ecore-con if it is disabled
On Mon, Oct 12, 2009 at 12:57:51AM +0200, Vincent Torri wrote: On Mon, 12 Oct 2009, Marc Andre Tanner wrote: On Sun, Oct 11, 2009 at 11:43:50PM +0200, Vincent Torri wrote: On Sun, 11 Oct 2009, Marc Andre Tanner wrote: This makes ecore-file useable without ecore-con. better one : http://pastebin.ca/1613582 Why do you think this one is better? It clutters the source with more #ifdef's and if you add a new function you will have to remember to add the check for BUILD_ECORE_CON. because you removed API functions, which must exist, ecore_con installed or not. Ok, I see, missed that. Could someone please apply the fix patch of Vincent then? Or should I I respin + resend. Thanks, Marc -- Marc Andre Tanner http://www.brain-dump.org/ GPG key: CF7D56C0 -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] [PATCH] evas: compile out unused dither tables
Don't include the rather large dither tables if small dithering code is enabled during ./configure stage. function old new delta _evas_dither_12812816384 - -16384 -- (add/remove: 0/1 grow/shrink: 0/0 up/down: 0/-16384) Total: -16384 bytes Signed-off-by: Marc Andre Tanner m...@brain-dump.org --- src/lib/engines/common/evas_convert_main.c |8 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/lib/engines/common/evas_convert_main.c b/src/lib/engines/common/evas_convert_main.c index 73790fd..b364651 100644 --- a/src/lib/engines/common/evas_convert_main.c +++ b/src/lib/engines/common/evas_convert_main.c @@ -11,6 +11,8 @@ #include evas_convert_gry_8.h #include evas_convert_yuv.h +#ifdef USE_DITHER_44 + const DATA8 _evas_dither_44[4][4] = { { 0, 8, 2, 10}, @@ -19,6 +21,10 @@ const DATA8 _evas_dither_44[4][4] = {15, 7, 13, 5} }; +#endif + +#ifdef USE_DITHER_128128 + const DATA8 _evas_dither_128128[128][128] = { { 0, 41, 23, 5, 17, 39, 7, 15, 62, 23, 40, 51, 31, 47, 9, 32, 52, 27, 57, 25, 6, 61, 27, 52, 37, 7, 40, 63, 18, 36, 10, 42, 25, 62, 45, 34, 20, 42, 37, 14, 35, 29, 50, 10, 61, 2, 40, 8, 37, 12, 58, 22, 5, 41, 10, 39, 0, 60, 11, 46, 2, 55, 38, 17, 36, 59, 13, 54, 37, 56, 8, 29, 16, 13, 63, 22, 41, 55, 7, 20, 49, 14, 23, 55, 37, 23, 19, 36, 15, 49, 23, 63, 30, 14, 38, 27, 53, 13, 22, 41, 19, 31, 7, 19, 50, 30, 49, 16, 3, 32, 56, 40, 29, 34, 8, 48, 19, 45, 4, 51, 12, 46, 35, 49, 16, 42, 12, 62 }, @@ -151,6 +157,8 @@ const DATA8 _evas_dither_128128[128][128] = { 51, 14, 61, 29, 59, 20, 55, 31, 0, 49, 11, 60, 3, 26, 22, 56, 0, 40, 12, 43, 41, 8, 36, 0, 17, 57, 24, 2, 46, 26, 61, 18, 0, 38, 12, 59, 6, 49, 3, 57, 19, 63, 5, 33, 18, 54, 28, 56, 0, 43, 26, 46, 63, 27, 56, 22, 27, 54, 38, 28, 63, 24, 10, 45, 0, 31, 42, 21, 12, 25, 44, 49, 59, 6, 26, 50, 3, 34, 27, 59, 0, 35, 62, 16, 4, 58, 47, 0, 43, 24, 37, 2, 54, 20, 46, 31, 0, 56, 34, 5, 55, 45, 60, 37, 0, 40, 10, 38, 63, 46, 15, 20, 0, 53, 21, 62, 30, 11, 24, 27, 40, 0, 57, 26, 3, 45, 27, 35 } }; +#endif /* USE_DITHER_128128 */ + EAPI void evas_common_convert_init(void) { -- 1.6.5 -- Download Intelreg; Parallel Studio Eval ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] [PATCH 1/2] eina: fix wrong EINA_ARG_NONNULL
This fixes the following error: CC libeina_la-eina_error.lo CC libeina_la-eina_log.lo In file included from ../../src/include/eina_safety_checks.h:69, from eina_error.c:150: ../../src/include/eina_error.h:53: error: nonnull argument references non-pointer operand (argument 1, operand 1) make[3]: *** [libeina_la-eina_error.lo] Error 1 make[3]: *** Waiting for unfinished jobs In file included from ../../src/include/eina_safety_checks.h:69, from eina_log.c:287: ../../src/include/eina_error.h:53: error: nonnull argument references non-pointer operand (argument 1, operand 1) make[3]: *** [libeina_la-eina_log.lo] Error 1 make[3]: Leaving directory `/data/projects/qi-bootmenu-system/build/temp-armv4tl/eina/src/lib' make[2]: *** [all-recursive] Error 1 make[2]: Leaving directory `/data/projects/qi-bootmenu-system/build/temp-armv4tl/eina/src' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/data/projects/qi-bootmenu-system/build/temp-armv4tl/eina' make: *** [all] Error 2 Signed-off-by: Marc Andre Tanner m...@brain-dump.org --- src/include/eina_error.h |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/include/eina_error.h b/src/include/eina_error.h index 7b290de..8c74b66 100644 --- a/src/include/eina_error.h +++ b/src/include/eina_error.h @@ -50,7 +50,7 @@ EAPI extern Eina_Error EINA_ERROR_OUT_OF_MEMORY; EAPI Eina_Error eina_error_msg_register(const char *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; EAPI Eina_Error eina_error_msg_static_register(const char *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; EAPI Eina_Booleina_error_msg_modify(Eina_Error error, - const char *msg) EINA_ARG_NONNULL(1, 2); + const char *msg) EINA_ARG_NONNULL(2); EAPI Eina_Error eina_error_get(void); EAPI void eina_error_set(Eina_Error err); EAPI const char * eina_error_msg_get(Eina_Error error) EINA_PURE; -- 1.6.5 -- Start uncovering the many advantages of virtual appliances and start using them to simplify application deployment and accelerate your shift to cloud computing. http://p.sf.net/sfu/novell-sfdev2dev ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] [PATCH 2/2] eina: fix compilation if safety checks are disabled
A few files include eina_safety_checks.h and then expect that eina_log.h is also dragged in, however this isn't the case if the safety checks were disabled at configure stage. Include eina_log.h explicitly to fix this. Signed-off-by: Marc Andre Tanner m...@brain-dump.org --- src/lib/eina_array.c|1 + src/lib/eina_list.c |1 + src/lib/eina_matrixsparse.c |1 + src/lib/eina_rectangle.c|1 + src/lib/eina_share_common.c |1 + src/lib/eina_stringshare.c |1 + 6 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/lib/eina_array.c b/src/lib/eina_array.c index 4ad8533..bd71fc9 100644 --- a/src/lib/eina_array.c +++ b/src/lib/eina_array.c @@ -118,6 +118,7 @@ #include eina_config.h #include eina_private.h #include eina_error.h +#include eina_log.h /* undefs EINA_ARG_NONULL() so NULL checks are not compiled out! */ #include eina_safety_checks.h diff --git a/src/lib/eina_list.c b/src/lib/eina_list.c index a09b3cf..e301476 100644 --- a/src/lib/eina_list.c +++ b/src/lib/eina_list.c @@ -75,6 +75,7 @@ #include eina_config.h #include eina_private.h #include eina_error.h +#include eina_log.h #include eina_mempool.h /* undefs EINA_ARG_NONULL() so NULL checks are not compiled out! */ diff --git a/src/lib/eina_matrixsparse.c b/src/lib/eina_matrixsparse.c index fc38159..e19f24a 100644 --- a/src/lib/eina_matrixsparse.c +++ b/src/lib/eina_matrixsparse.c @@ -40,6 +40,7 @@ #include eina_config.h #include eina_private.h #include eina_error.h +#include eina_log.h #include eina_magic.h #include eina_mempool.h diff --git a/src/lib/eina_rectangle.c b/src/lib/eina_rectangle.c index 9ef0451..237ca8b 100644 --- a/src/lib/eina_rectangle.c +++ b/src/lib/eina_rectangle.c @@ -34,6 +34,7 @@ #include eina_mempool.h #include eina_list.h #include eina_trash.h +#include eina_log.h /* undefs EINA_ARG_NONULL() so NULL checks are not compiled out! */ #include eina_safety_checks.h diff --git a/src/lib/eina_share_common.c b/src/lib/eina_share_common.c index 0699871..2302843 100644 --- a/src/lib/eina_share_common.c +++ b/src/lib/eina_share_common.c @@ -76,6 +76,7 @@ #include eina_hash.h #include eina_rbtree.h #include eina_error.h +#include eina_log.h /* undefs EINA_ARG_NONULL() so NULL checks are not compiled out! */ #include eina_safety_checks.h diff --git a/src/lib/eina_stringshare.c b/src/lib/eina_stringshare.c index 644915b..86b4617 100644 --- a/src/lib/eina_stringshare.c +++ b/src/lib/eina_stringshare.c @@ -69,6 +69,7 @@ void *alloca (size_t); #include eina_hash.h #include eina_rbtree.h #include eina_error.h +#include eina_log.h #include eina_stringshare.h /* undefs EINA_ARG_NONULL() so NULL checks are not compiled out! */ -- 1.6.5 -- Start uncovering the many advantages of virtual appliances and start using them to simplify application deployment and accelerate your shift to cloud computing. http://p.sf.net/sfu/novell-sfdev2dev ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel