diff options
Diffstat (limited to '')
3 files changed, 24 insertions, 18 deletions
diff --git a/libraries/eina/src/modules/mp/chained_pool/Makefile.am b/libraries/eina/src/modules/mp/chained_pool/Makefile.am index 815bab7..42d0d7e 100644 --- a/libraries/eina/src/modules/mp/chained_pool/Makefile.am +++ b/libraries/eina/src/modules/mp/chained_pool/Makefile.am | |||
@@ -6,7 +6,6 @@ AM_CPPFLAGS = \ | |||
6 | -I$(top_builddir)/src/include \ | 6 | -I$(top_builddir)/src/include \ |
7 | -I$(top_srcdir)/src/lib \ | 7 | -I$(top_srcdir)/src/lib \ |
8 | -I$(top_builddir)/src/lib \ | 8 | -I$(top_builddir)/src/lib \ |
9 | @EINA_CPPFLAGS@ \ | ||
10 | @EFL_EINA_BUILD@ \ | 9 | @EFL_EINA_BUILD@ \ |
11 | @VALGRIND_CFLAGS@ | 10 | @VALGRIND_CFLAGS@ |
12 | 11 | ||
diff --git a/libraries/eina/src/modules/mp/chained_pool/Makefile.in b/libraries/eina/src/modules/mp/chained_pool/Makefile.in index 03b639f..78299a4 100644 --- a/libraries/eina/src/modules/mp/chained_pool/Makefile.in +++ b/libraries/eina/src/modules/mp/chained_pool/Makefile.in | |||
@@ -37,20 +37,24 @@ host_triplet = @host@ | |||
37 | subdir = src/modules/mp/chained_pool | 37 | subdir = src/modules/mp/chained_pool |
38 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in | 38 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in |
39 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | 39 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
40 | am__aclocal_m4_deps = $(top_srcdir)/m4/efl_attribute.m4 \ | 40 | am__aclocal_m4_deps = $(top_srcdir)/m4/eina/eina_bench.m4 \ |
41 | $(top_srcdir)/m4/efl_benchmark.m4 \ | 41 | $(top_srcdir)/m4/eina/eina_check.m4 \ |
42 | $(top_srcdir)/m4/efl_compiler_flag.m4 \ | 42 | $(top_srcdir)/m4/common/efl_attribute.m4 \ |
43 | $(top_srcdir)/m4/efl_coverage.m4 $(top_srcdir)/m4/efl_cpu.m4 \ | 43 | $(top_srcdir)/m4/common/efl_benchmark.m4 \ |
44 | $(top_srcdir)/m4/efl_doxygen.m4 \ | 44 | $(top_srcdir)/m4/common/efl_compiler_flag.m4 \ |
45 | $(top_srcdir)/m4/efl_examples.m4 \ | 45 | $(top_srcdir)/m4/common/efl_coverage.m4 \ |
46 | $(top_srcdir)/m4/efl_fnmatch.m4 \ | 46 | $(top_srcdir)/m4/common/efl_cpu.m4 \ |
47 | $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/efl_tests.m4 \ | 47 | $(top_srcdir)/m4/common/efl_doxygen.m4 \ |
48 | $(top_srcdir)/m4/efl_threads.m4 \ | 48 | $(top_srcdir)/m4/common/efl_examples.m4 \ |
49 | $(top_srcdir)/m4/efl_voltron.m4 $(top_srcdir)/m4/eina_bench.m4 \ | 49 | $(top_srcdir)/m4/common/efl_fnmatch.m4 \ |
50 | $(top_srcdir)/m4/eina_check.m4 $(top_srcdir)/m4/libtool.m4 \ | 50 | $(top_srcdir)/m4/common/efl_path_max.m4 \ |
51 | $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ | 51 | $(top_srcdir)/m4/common/efl_tests.m4 \ |
52 | $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ | 52 | $(top_srcdir)/m4/common/efl_threads.m4 \ |
53 | $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac | 53 | $(top_srcdir)/m4/common/efl_voltron.m4 \ |
54 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ | ||
55 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ | ||
56 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ | ||
57 | $(top_srcdir)/configure.ac | ||
54 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 58 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
55 | $(ACLOCAL_M4) | 59 | $(ACLOCAL_M4) |
56 | mkinstalldirs = $(install_sh) -d | 60 | mkinstalldirs = $(install_sh) -d |
@@ -166,13 +170,13 @@ EINA_CONFIGURE_DEFAULT_MEMPOOL = @EINA_CONFIGURE_DEFAULT_MEMPOOL@ | |||
166 | EINA_CONFIGURE_ENABLE_LOG = @EINA_CONFIGURE_ENABLE_LOG@ | 170 | EINA_CONFIGURE_ENABLE_LOG = @EINA_CONFIGURE_ENABLE_LOG@ |
167 | EINA_CONFIGURE_HAVE_DEBUG_THREADS = @EINA_CONFIGURE_HAVE_DEBUG_THREADS@ | 171 | EINA_CONFIGURE_HAVE_DEBUG_THREADS = @EINA_CONFIGURE_HAVE_DEBUG_THREADS@ |
168 | EINA_CONFIGURE_HAVE_DIRENT_H = @EINA_CONFIGURE_HAVE_DIRENT_H@ | 172 | EINA_CONFIGURE_HAVE_DIRENT_H = @EINA_CONFIGURE_HAVE_DIRENT_H@ |
173 | EINA_CONFIGURE_HAVE_EXOTIC = @EINA_CONFIGURE_HAVE_EXOTIC@ | ||
169 | EINA_CONFIGURE_HAVE_INTTYPES_H = @EINA_CONFIGURE_HAVE_INTTYPES_H@ | 174 | EINA_CONFIGURE_HAVE_INTTYPES_H = @EINA_CONFIGURE_HAVE_INTTYPES_H@ |
170 | EINA_CONFIGURE_HAVE_ON_OFF_THREADS = @EINA_CONFIGURE_HAVE_ON_OFF_THREADS@ | 175 | EINA_CONFIGURE_HAVE_ON_OFF_THREADS = @EINA_CONFIGURE_HAVE_ON_OFF_THREADS@ |
171 | EINA_CONFIGURE_HAVE_STDINT_H = @EINA_CONFIGURE_HAVE_STDINT_H@ | 176 | EINA_CONFIGURE_HAVE_STDINT_H = @EINA_CONFIGURE_HAVE_STDINT_H@ |
172 | EINA_CONFIGURE_HAVE_THREADS = @EINA_CONFIGURE_HAVE_THREADS@ | 177 | EINA_CONFIGURE_HAVE_THREADS = @EINA_CONFIGURE_HAVE_THREADS@ |
173 | EINA_CONFIGURE_MAGIC_DEBUG = @EINA_CONFIGURE_MAGIC_DEBUG@ | 178 | EINA_CONFIGURE_MAGIC_DEBUG = @EINA_CONFIGURE_MAGIC_DEBUG@ |
174 | EINA_CONFIGURE_SAFETY_CHECKS = @EINA_CONFIGURE_SAFETY_CHECKS@ | 179 | EINA_CONFIGURE_SAFETY_CHECKS = @EINA_CONFIGURE_SAFETY_CHECKS@ |
175 | EINA_CPPFLAGS = @EINA_CPPFLAGS@ | ||
176 | EINA_LIBS = @EINA_LIBS@ | 180 | EINA_LIBS = @EINA_LIBS@ |
177 | EINA_SIZEOF_WCHAR_T = @EINA_SIZEOF_WCHAR_T@ | 181 | EINA_SIZEOF_WCHAR_T = @EINA_SIZEOF_WCHAR_T@ |
178 | EMEMOA_CFLAGS = @EMEMOA_CFLAGS@ | 182 | EMEMOA_CFLAGS = @EMEMOA_CFLAGS@ |
@@ -182,6 +186,8 @@ ESCAPE_LIBS = @ESCAPE_LIBS@ | |||
182 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 186 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
183 | EVIL_LIBS = @EVIL_LIBS@ | 187 | EVIL_LIBS = @EVIL_LIBS@ |
184 | EXEEXT = @EXEEXT@ | 188 | EXEEXT = @EXEEXT@ |
189 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
190 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
185 | FGREP = @FGREP@ | 191 | FGREP = @FGREP@ |
186 | GLIB_CFLAGS = @GLIB_CFLAGS@ | 192 | GLIB_CFLAGS = @GLIB_CFLAGS@ |
187 | GLIB_LIBS = @GLIB_LIBS@ | 193 | GLIB_LIBS = @GLIB_LIBS@ |
@@ -217,6 +223,8 @@ PACKAGE_URL = @PACKAGE_URL@ | |||
217 | PACKAGE_VERSION = @PACKAGE_VERSION@ | 223 | PACKAGE_VERSION = @PACKAGE_VERSION@ |
218 | PATH_SEPARATOR = @PATH_SEPARATOR@ | 224 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
219 | PKG_CONFIG = @PKG_CONFIG@ | 225 | PKG_CONFIG = @PKG_CONFIG@ |
226 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
227 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
220 | RANLIB = @RANLIB@ | 228 | RANLIB = @RANLIB@ |
221 | SED = @SED@ | 229 | SED = @SED@ |
222 | SET_MAKE = @SET_MAKE@ | 230 | SET_MAKE = @SET_MAKE@ |
@@ -297,7 +305,6 @@ AM_CPPFLAGS = \ | |||
297 | -I$(top_builddir)/src/include \ | 305 | -I$(top_builddir)/src/include \ |
298 | -I$(top_srcdir)/src/lib \ | 306 | -I$(top_srcdir)/src/lib \ |
299 | -I$(top_builddir)/src/lib \ | 307 | -I$(top_builddir)/src/lib \ |
300 | @EINA_CPPFLAGS@ \ | ||
301 | @EFL_EINA_BUILD@ \ | 308 | @EFL_EINA_BUILD@ \ |
302 | @VALGRIND_CFLAGS@ | 309 | @VALGRIND_CFLAGS@ |
303 | 310 | ||
diff --git a/libraries/eina/src/modules/mp/chained_pool/eina_chained_mempool.c b/libraries/eina/src/modules/mp/chained_pool/eina_chained_mempool.c index 020d0ad..e56df4c 100644 --- a/libraries/eina/src/modules/mp/chained_pool/eina_chained_mempool.c +++ b/libraries/eina/src/modules/mp/chained_pool/eina_chained_mempool.c | |||
@@ -52,7 +52,7 @@ | |||
52 | #include "eina_private.h" | 52 | #include "eina_private.h" |
53 | 53 | ||
54 | #ifndef NVALGRIND | 54 | #ifndef NVALGRIND |
55 | # include <valgrind/memcheck.h> | 55 | # include <memcheck.h> |
56 | #endif | 56 | #endif |
57 | 57 | ||
58 | #if defined DEBUG || defined EINA_DEBUG_MALLOC | 58 | #if defined DEBUG || defined EINA_DEBUG_MALLOC |