efl: merge edje.

this is still in progress, mostly the multisense stuff is pending.

it seems that when we merge ecore_audio in edje the libremix and
similar are gone, at least from Edje, and will be in ecore_audio
itself (or pulseaudio).

Changes:
 * __UNUSED__ to EINA_UNUSED
 * binaries (epp, embryo_cc, edje_cc) now consider EFL_RUN_IN_TREE and
   will assume the binaries are still not installed, running from
   build tree location (needs more testing, maybe doesn't work with
   srcdir != builddir, still doesn't solve cross compile builds)



SVN revision: 82139
parent e2ce20e9
......@@ -100,7 +100,8 @@ pc/efreet.pc \
pc/efreet-mime.pc \
pc/efreet-trash.pc \
pc/eeze.pc \
pc/ephysics.pc
pc/ephysics.pc \
pc/edje.pc
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA =
......@@ -132,7 +133,8 @@ pc/eio.pc \
pc/edbus2.pc \
pc/efreet.pc \
pc/efreet-mime.pc \
pc/efreet-trash.pc
pc/efreet-trash.pc \
pc/edje.pc
if BUILD_ENGINE_SOFTWARE_X11
pkgconfig_DATA += pc/evas-software-x11.pc
......
......@@ -3266,6 +3266,63 @@ EFL_LIB_END_OPTIONAL([EPhysics])
#### End of EPhysics
#### Edje
EFL_LIB_START([Edje])
### Additional options to configure
### Default values
want_multisense="no" # TODO: move to ecore_audio and enable
want_edje_program_cache="no"
want_edje_calc_cache="yes"
want_fixed_point="no"
### Checks for programs
### Checks for libraries
EFL_PLATFORM_DEPEND([EDJE], [evil])
EFL_INTERNAL_DEPEND_PKG([EDJE], [eina])
EFL_INTERNAL_DEPEND_PKG([EDJE], [eo])
EFL_INTERNAL_DEPEND_PKG([EDJE], [eet])
EFL_INTERNAL_DEPEND_PKG([EDJE], [evas])
EFL_INTERNAL_DEPEND_PKG([EDJE], [ecore])
EFL_INTERNAL_DEPEND_PKG([EDJE], [ecore-evas])
EFL_INTERNAL_DEPEND_PKG([EDJE], [ecore-file])
EFL_INTERNAL_DEPEND_PKG([EDJE], [ecore-input])
EFL_INTERNAL_DEPEND_PKG([EDJE], [ecore-imf])
EFL_INTERNAL_DEPEND_PKG([EDJE], [ecore-imf-evas])
EFL_INTERNAL_DEPEND_PKG([EDJE], [embryo])
EFL_INTERNAL_DEPEND_PKG([EDJE], [eio])
EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EDJE], [${want_physics}], [ephysics])
#EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EDJE], [${want_multisense}], [ecore-audio])
EFL_CHECK_LUA_5_1([EDJE])
EFL_ADD_LIBS([EDJE], [-lm])
EFL_EVAL_PKGS([EDJE])
AM_CONDITIONAL([ENABLE_MULTISENSE], [test "${want_multisense}" = "yes"])
AC_DEFINE_IF([ENABLE_MULTISENSE], [test "${want_multisense}" = "yes"],
[1], [Use Multisense])
AC_SUBST([want_multisense])
### Checks for header files
### Checks for types
### Checks for structures
### Checks for compiler characteristics
### Checks for linker characteristics
### Checks for library functions
EFL_LIB_END([Edje])
#### End of Edje
AC_CONFIG_FILES([
Makefile
data/Makefile
......@@ -3284,6 +3341,7 @@ src/examples/ecore/Makefile
src/examples/eio/Makefile
src/examples/edbus/Makefile
src/examples/ephysics/Makefile
src/examples/edje/Makefile
src/lib/eina/eina_config.h
src/lib/ecore_x/ecore_x_version.h
spec/efl.spec
......@@ -3331,6 +3389,7 @@ pc/efreet-mime.pc
pc/efreet-trash.pc
pc/eeze.pc
pc/ephysics.pc
pc/edje.pc
dbus-services/org.enlightenment.Efreet.service
$po_makefile_in
])
......@@ -3537,6 +3596,7 @@ echo
echo "Eeze...................: ${efl_lib_optional_eeze} (tizen: ${want_tizen})"
echo "EPhysics...............: ${efl_lib_optional_ephysics}"
echo "Edje...................: yes (physics=${efl_lib_optional_ephysics}, multisense=${want_multisense})"
echo "Tests..................: ${build_tests}"
echo "Examples...............: make examples"
......
MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST =
########################################################################
# Embryo
embryofilesdir = $(datadir)/embryo/include
embryofiles_DATA = embryo/default.inc
########################################################################
# Evas
evasfilesdir = $(datadir)/evas
evasfiles_DATA = evas/checkme
########################################################################
# Eo
eofilesdir = $(datadir)/eo
eofiles_DATA = eo/eo_step.py
EXTRA_DIST = embryo/default.inc evas/checkme eo/eo_step.py
########################################################################
# Edje
edjefilesdir = $(datadir)/edje/include
edjefiles_DATA = edje/include/edje.inc
mimedir = $(datadir)/mime/packages
mime_DATA = edje/edje.xml
EXTRA_DIST += edje/edc.vim edje/edje-mode.el
......@@ -602,7 +602,8 @@ INPUT = @top_srcdir@/src/lib \
@srcdir@/eo_tutorial.dox \
@srcdir@/eio_examples.dox \
@srcdir@/edbus_examples.dox \
@srcdir@/ephysics_examples.dox
@srcdir@/ephysics_examples.dox \
@srcdir@/edje_examples.dox
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
......@@ -810,7 +811,8 @@ eio_ _eio_ Eio_ _Eio_ EIO_ _EIO_ \
edbus_ _edbus_ EDBus_ _EDBus_ EDBUS_ _EDBUS_ \
efreet_ _efreet_ Efreet_ _Efreet_ EFREET_ _EFREET_ \
eeze_ _eeze_ Eeze_ _Eeze_ EEZE_ _EEZE_ \
ephysics_ _ephysics_ EPhysics_ _EPhysics_ EPHYSICS_ _EPHYSICS_
ephysics_ _ephysics_ EPhysics_ _EPhysics_ EPHYSICS_ _EPHYSICS_ \
edje_ _edje_ Edje_ _Edje_ EDJE_ _EDJE_
#---------------------------------------------------------------------------
......
/**
* @page Examples Examples
*
* Here is a page with examples.
* @page edje_examples Examples
*
* Examples:
* @li @ref Example_Edje_Basics
* @li @ref tutorial_edje_nested
* @li @ref tutorial_edje_swallow
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
dnl EFL_CHECK_LUA_5_1(EFL)
dnl checks for lua5.1 in pkg-config (multiple names) and -llua directly
dnl will call EFL_ADD_LIBS() or EFL_DEPEND_PKG() as required.
dnl this is a strict call and will abort if lua is not found
AC_DEFUN([EFL_CHECK_LUA_5_1],
[dnl
requirement_lua=""
PKG_CHECK_EXISTS([lua >= 5.1.0], [requirement_lua="lua >= 5.1.0"],
[PKG_CHECK_EXISTS([lua5.1 >= 5.1.0], [requirement_lua="lua5.1 >= 5.1.0"],
[PKG_CHECK_EXISTS([lua-5.1 >= 5.1.0], [requirement_lua="lua-5.1 >= 5.1.0"],
[PKG_CHECK_EXISTS([lua51 >= 5.1.0], [requirement_lua="lua51 >= 5.1.0"])])])])
if test "x${requirement_lua}" = "x"; then
AC_MSG_CHECKING([whether lua_newstate() is in liblua])
AC_CHECK_LIB([lua], [lua_newstate],
[have_lua="yes"
EFL_ADD_LIBS([$1], [-llua])],
[have_lua="no"])
AC_MSG_RESULT([${have_lua}])
if test "${have_lua}" = "no"; then
AC_MSG_ERROR([Missing lua 5.1 support])
fi
else
EFL_DEPEND_PKG([$1], [LUA], [${requirement_lua}])
fi
])
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
modules=@libdir@/@PACKAGE@/modules
modules=@libdir@/edje/modules
includedir=@includedir@
datarootdir=@datarootdir@
datadir=@datadir@/edje
......@@ -10,8 +10,8 @@ multisense=@want_multisense@
Name: edje
Description: Enlightened graphical design and layout engine.
@pkgconfig_requires_private@: @requirement_edje@
Requires.private: @requirements_pc_edje@
Version: @VERSION@
Libs: -L${libdir} -ledje
Libs.private: @lua_libs@
Libs.private: @requirements_libs_edje@
Cflags: -I${includedir}/edje-@VMAJ@
......@@ -67,6 +67,7 @@ endif
if HAVE_EPHYSICS
include Makefile_EPhysics.am
endif
include Makefile_Edje.am
.PHONY: benchmark examples
......@@ -85,6 +86,7 @@ clean-local:
rm -rf bin/eet/*.gcno
rm -rf bin/efreet/*.gcno
rm -rf bin/eeze/*.gcno
rm -rf bin/edje/*.gcno
rm -rf lib/evil/*.gcno
rm -rf lib/eina/*.gcno
rm -rf lib/eo/*.gcno
......@@ -103,6 +105,7 @@ clean-local:
rm -rf lib/efreet/*.gcno
rm -rf lib/eeze/*.gcno
rm -rf lib/ephysics/*.gcno
rm -rf lib/edje/*.gcno
rm -rf modules/eina/mp/pass_through/*.gcno
rm -rf modules/eina/mp/one_big/*.gcno
rm -rf modules/eina/mp/chained_pool/*.gcno
......@@ -139,5 +142,8 @@ clean-local:
rm -rf modules/evas/savers/jpeg/*.gcno
rm -rf modules/evas/savers/png/*.gcno
rm -rf modules/evas/savers/tiff/*.gcno
rm -rf modules/edje/alsa_snd_player/*.gcno
rm -rf modules/edje/eet_snd_reader/*.gcno
rm -rf modules/edje/multisense_factory/*.gcno
rm -rf static_libs/liblinebreak/*.gcno
rm -rf static_libs/lz4/*.gcno
### Library
lib_LTLIBRARIES += lib/edje/libedje.la
EDJE_COMMON_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/src/lib/eina \
-I$(top_builddir)/src/lib/eina \
-I$(top_srcdir)/src/lib/eo \
-I$(top_builddir)/src/lib/eo \
-I$(top_srcdir)/src/lib/eet \
-I$(top_builddir)/src/lib/eet \
-I$(top_srcdir)/src/lib/evas \
-I$(top_builddir)/src/lib/evas \
-I$(top_srcdir)/src/lib/ecore \
-I$(top_builddir)/src/lib/ecore \
-I$(top_srcdir)/src/lib/ecore_evas \
-I$(top_builddir)/src/lib/ecore_evas \
-I$(top_srcdir)/src/lib/ecore_file \
-I$(top_builddir)/src/lib/ecore_file \
-I$(top_srcdir)/src/lib/ecore_input \
-I$(top_builddir)/src/lib/ecore_input \
-I$(top_srcdir)/src/lib/ecore_imf \
-I$(top_builddir)/src/lib/ecore_imf \
-I$(top_srcdir)/src/lib/embryo \
-I$(top_builddir)/src/lib/embryo \
-I$(top_srcdir)/src/lib/eio \
-I$(top_builddir)/src/lib/eio \
-I$(top_srcdir)/src/lib/ephysics \
-I$(top_builddir)/src/lib/ephysics \
-I$(top_srcdir)/src/lib/edje \
-I$(top_builddir)/src/lib/edje \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/edje\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
-DEFL_EDJE_BUILD \
@EFL_COV_CFLAGS@ \
@EDJE_CFLAGS@ \
@USE_EVIL_CFLAGS@
EDJE_COMMON_LIBS = \
lib/eina/libeina.la \
lib/eo/libeo.la \
lib/eet/libeet.la \
lib/evas/libevas.la \
lib/ecore/libecore.la \
lib/ecore_evas/libecore_evas.la \
lib/ecore_file/libecore_file.la \
lib/ecore_input/libecore_input.la \
lib/ecore_imf/libecore_imf.la \
lib/ecore_imf/libecore_imf_evas.la \
lib/embryo/libembryo.la \
lib/eio/libeio.la \
@USE_EVIL_LIBS@ \
@EFL_COV_LIBS@
if HAVE_EPHYSICS
EDJE_COMMON_LIBS += lib/ephysics/libephysics.la
endif
installed_edjemainheadersdir = $(includedir)/edje-@VMAJ@
dist_installed_edjemainheaders_DATA = \
lib/edje/Edje.h \
lib/edje/Edje_Edit.h
lib_edje_libedje_la_SOURCES = \
lib/edje/edje_private.h \
lib/edje/edje_container.h \
lib/edje/edje_convert.h \
lib/edje/edje_box_layout.c \
lib/edje/edje_cache.c \
lib/edje/edje_calc.c \
lib/edje/edje_callbacks.c \
lib/edje/edje_container.c \
lib/edje/edje_data.c \
lib/edje/edje_edit.c \
lib/edje/edje_embryo.c \
lib/edje/edje_entry.c \
lib/edje/edje_external.c \
lib/edje/edje_load.c \
lib/edje/edje_lua.c \
lib/edje/edje_lua2.c \
lib/edje/edje_lua_script_only.c \
lib/edje/edje_main.c \
lib/edje/edje_match.c \
lib/edje/edje_message_queue.c \
lib/edje/edje_misc.c \
lib/edje/edje_module.c \
lib/edje/edje_multisense.c \
lib/edje/edje_program.c \
lib/edje/edje_script_only.c \
lib/edje/edje_smart.c \
lib/edje/edje_text.c \
lib/edje/edje_textblock_styles.c \
lib/edje/edje_util.c \
lib/edje/edje_var.c
lib_edje_libedje_la_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
lib_edje_libedje_la_LIBADD = $(EDJE_COMMON_LIBS) @EDJE_LIBS@
lib_edje_libedje_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
if ENABLE_MULTISENSE
# edjemoduleXXXdir = $(libdir)/edje/modules/
# edjemoduleXXX_LTLIBRARIES = modules/edje/XXX/module.la
#
# modules_edje_XXX_module_la_SOURCES = modules/edje/XXX/XXX.c
# modules_edje_XXX_module_la_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) @XXX_LIBS@
# modules_edje_XXX_module_la_LIBADD = $(EDJE_COMMON_USER_LIBADD)
# modules_edje_XXX_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
# modules_edje_XXX_module_la_LIBTOOLFLAGS = --tag=disable-static
# edjemodulemultisensefactorydir = $(libdir)/edje/modules/multisense_factory/$(MODULE_ARCH)
# edjemodulemultisensefactory_LTLIBRARIES = modules/edje/multisense_factory/module.la
#
# modules_edje_multisense_factory_module_la_SOURCES = \
# modules/edje/multisense_factory/multisense_factory.c
# modules_edje_multisense_factory_module_la_CPPFLAGS = \
# $(EDJE_COMMON_CPPFLAGS) \
# @REMIX_CFLAGS@
# modules_edje_multisense_factory_module_la_LIBADD = \
# $(EDJE_COMMON_USER_LIBADD) \
# @REMIX_LIBS@
# modules_edje_multisense_factory_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
# modules_edje_multisense_factory_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
### Binary
EDJE_COMMON_USER_LDADD = \
$(EDJE_COMMON_LIBS) \
lib/edje/libedje.la \
@EDJE_LDFLAGS@
bin_PROGRAMS += \
bin/edje/edje_cc \
bin/edje/edje_decc \
bin/edje/edje_player \
bin/edje/edje_inspector \
bin/edje/edje_external_inspector \
bin/edje/edje_codegen \
bin/edje/edje_pick \
bin/edje/edje_watch
bin_edje_edje_cc_SOURCES = \
bin/edje/edje_multisense_convert.h \
bin/edje/edje_cc.h \
bin/edje/edje_cc.c \
bin/edje/edje_cc_out.c \
bin/edje/edje_cc_parse.c \
bin/edje/edje_cc_mem.c \
bin/edje/edje_cc_handlers.c \
bin/edje/edje_cc_sources.c \
bin/edje/edje_multisense_convert.c
bin_edje_edje_cc_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
bin_edje_edje_cc_LDADD = $(EDJE_COMMON_USER_LDADD)
bin_edje_edje_decc_SOURCES = \
bin/edje/edje_decc.c \
bin/edje/edje_decc.h \
bin/edje/edje_cc_mem.c \
bin/edje/edje_cc_sources.c
bin_edje_edje_decc_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
bin_edje_edje_decc_LDADD = $(EDJE_COMMON_USER_LDADD)
bin_edje_edje_player_SOURCES = bin/edje/edje_player.c
bin_edje_edje_player_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
bin_edje_edje_player_LDADD = $(EDJE_COMMON_USER_LDADD)
bin_edje_edje_inspector_SOURCES = bin/edje/edje_inspector.c
bin_edje_edje_inspector_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
bin_edje_edje_inspector_LDADD = $(EDJE_COMMON_USER_LDADD)
bin_edje_edje_external_inspector_SOURCES = bin/edje/edje_external_inspector.c
bin_edje_edje_external_inspector_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
bin_edje_edje_external_inspector_LDADD = $(EDJE_COMMON_USER_LDADD)
bin_edje_edje_codegen_SOURCES = bin/edje/edje_codegen.c
bin_edje_edje_codegen_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
bin_edje_edje_codegen_LDADD = $(EDJE_COMMON_USER_LDADD)
bin_edje_edje_pick_SOURCES = bin/edje/edje_pick.c
bin_edje_edje_pick_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
bin_edje_edje_pick_LDADD = $(EDJE_COMMON_USER_LDADD)
bin_edje_edje_watch_SOURCES = bin/edje/edje_watch.c
bin_edje_edje_watch_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
bin_edje_edje_watch_LDADD = $(EDJE_COMMON_USER_LDADD)
# EPP (Edje's CPP)
eppdir = $(libdir)/edje/utils
epp_PROGRAMS = bin/edje/epp/epp
bin_edje_epp_epp_SOURCES = \
bin/edje/epp/cpplib.h \
bin/edje/epp/cpphash.h \
bin/edje/epp/cppalloc.c \
bin/edje/epp/cpperror.c \
bin/edje/epp/cppexp.c \
bin/edje/epp/cpphash.c \
bin/edje/epp/cpplib.c \
bin/edje/epp/cppmain.c
# Note: eina is included only because of EINA_UNUSED
bin_edje_epp_epp_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir)/src/lib/eina \
-I$(top_builddir)/src/lib/eina \
$(CWARNFLAGS) \
-DHAVE_CONFIG_H \
-DHAVE_STRERROR \
-DFATAL_EXIT_CODE=1 \
-DSUCCESS_EXIT_CODE=0 \
-DGCC_INCLUDE_DIR=\"/usr/include\" \
-DGPLUSPLUS_INCLUDE_DIR=\"/usr/include\" \
-DTOOL_INCLUDE_DIR=\"/usr/bin\" \
-DHOST_BITS_PER_LONG=32 \
-DBITS_PER_UNIT=8 \
-DHOST_BITS_PER_INT=32 \
-DBITS_PER_WORD=16 \
-DTARGET_BELL=7 \
-DTARGET_BS=8 \
-DTARGET_FF=12 \
-DTARGET_NEWLINE=10 \
-DTARGET_CR=13 \
-DTARGET_TAB=9 \
-DTARGET_VT=11
# TODO: why keep these?
EXTRA_DIST += \
bin/edje/edje_convert.h \
bin/edje/edje_convert.c \
bin/edje/edje_data_convert.c
### Unit tests
if EFL_ENABLE_TESTS
check_PROGRAMS += tests/edje/edje_suite
tests_edje_edje_suite_SOURCES = \
tests/edje/edje_suite.c \
tests/edje/edje_test_edje.c \
tests/edje/edje_suite.h
tests_edje_edje_suite_CPPFLAGS = \
$(EDJE_COMMON_CPPFLAGS) \
@CHECK_CFLAGS@
tests_edje_edje_suite_LDADD = \
$(EDJE_COMMON_USER_LDADD) \
@CHECK_LIBS@
endif
......@@ -60,6 +60,7 @@ bin_embryo_embryo_cc_CPPFLAGS = \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
@EMBRYO_CFLAGS@ \
@USE_EVIL_CFLAGS@
......
......@@ -40,7 +40,7 @@ _edje_cc_log_cb(const Eina_Log_Domain *d,
const char *fnc,
int fline,
const char *fmt,
__UNUSED__ void *data,
EINA_UNUSED void *data,
va_list args)
{
if ((d->name) && (d->namelen == sizeof("edje_cc") - 1) &&
......
......@@ -2464,9 +2464,6 @@ st_collections_group_name(void)
current_pc = eina_list_data_get(eina_list_last(edje_collections));
if (current_de->entry)
goto double_named_group;
current_de->entry = parse_str(0);
current_pc->part = current_de->entry;
......@@ -2489,10 +2486,6 @@ st_collections_group_name(void)
break;
}
double_named_group:
ERR("Invalid group, only a single name statement is valid for group, use "
"alias instead.");
exit(-1);
}
typedef struct _Edje_List_Foreach_Data Edje_List_Foreach_Data;
......@@ -2502,7 +2495,7 @@ struct _Edje_List_Foreach_Data
};
static Eina_Bool
_edje_data_item_list_foreach(const Eina_Hash *hash __UNUSED__, const void *key, void *data __UNUSED__, void *fdata)
_edje_data_item_list_foreach(const Eina_Hash *hash EINA_UNUSED, const void *key, void *data EINA_UNUSED, void *fdata)
{
Edje_List_Foreach_Data *fd;
......
......@@ -204,7 +204,7 @@ static Eina_Hash *part_dest_lookup = NULL;
static Eina_Hash *part_pc_dest_lookup = NULL;
void
error_and_abort(Eet_File *ef __UNUSED__, const char *fmt, ...)
error_and_abort(Eet_File *ef EINA_UNUSED, const char *fmt, ...)
{
va_list ap;
......@@ -218,20 +218,20 @@ error_and_abort(Eet_File *ef __UNUSED__, const char *fmt, ...)
}
static unsigned int
_double_pointer_key_length(const void *key __UNUSED__)
_double_pointer_key_length(const void *key EINA_UNUSED)
{
return sizeof (void*) * 2;
}
static int
_double_pointer_key_cmp(const void *key1, int key1_length,
const void *key2, int key2_length __UNUSED__)
const void *key2, int key2_length EINA_UNUSED)
{
return memcmp(key1, key2, key1_length);
}
static int
_double_pointer_key_hash(const void *key, int key_length __UNUSED__)
_double_pointer_key_hash(const void *key, int key_length EINA_UNUSED)
{
#ifdef __LP64__
return eina_hash_int64(key, sizeof (void*)) ^
......@@ -359,7 +359,7 @@ check_program(Edje_Part_Collection *pc, Edje_Program *ep, Eet_File *ef)
}
static void
data_thread_head(void *data, Ecore_Thread *thread __UNUSED__)
data_thread_head(void *data, Ecore_Thread *thread EINA_UNUSED)
{
Head_Write *hw = data;
int bytes = 0;
......@@ -417,7 +417,7 @@ data_thread_head(void *data, Ecore_Thread *thread __UNUSED__)
}
static void
data_thread_head_end(void *data, Ecore_Thread *thread __UNUSED__)
data_thread_head_end(void *data, Ecore_Thread *thread EINA_UNUSED)
{
Head_Write *hw = data;
......@@ -449,7 +449,7 @@ data_write_header(Eet_File *ef)
}
static void
data_thread_fonts(void *data, Ecore_Thread *thread __UNUSED__)
data_thread_fonts(void *data, Ecore_Thread *thread EINA_UNUSED)
{
Fonts_Write *fc = data;
Eina_List *ll;
......@@ -516,7 +516,7 @@ data_thread_fonts(void *data, Ecore_Thread *thread __UNUSED__)
}
static void
data_thread_fonts_end(void *data, Ecore_Thread *thread __UNUSED__)
data_thread_fonts_end(void *data, Ecore_Thread *thread EINA_UNUSED)
{
Fonts_Write *fc = data;
pending_threads--;
......@@ -645,7 +645,7 @@ error_and_abort_image_load_error(Eet_File *ef, const char *file, int error)
}
static void