diff options
Diffstat (limited to '')
-rw-r--r-- | libraries/evas/src/lib/file/Makefile.in | 8 | ||||
-rw-r--r-- | libraries/evas/src/lib/file/evas_module.c | 4 | ||||
-rw-r--r-- | libraries/evas/src/lib/file/evas_path.c | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/libraries/evas/src/lib/file/Makefile.in b/libraries/evas/src/lib/file/Makefile.in index 599d980..2ac89b1 100644 --- a/libraries/evas/src/lib/file/Makefile.in +++ b/libraries/evas/src/lib/file/Makefile.in | |||
@@ -196,8 +196,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
196 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 196 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
197 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 197 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
198 | PKG_CONFIG = @PKG_CONFIG@ | 198 | PKG_CONFIG = @PKG_CONFIG@ |
199 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
200 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
201 | PNG_CFLAGS = @PNG_CFLAGS@ | 199 | PNG_CFLAGS = @PNG_CFLAGS@ |
202 | PNG_LIBS = @PNG_LIBS@ | 200 | PNG_LIBS = @PNG_LIBS@ |
203 | RANLIB = @RANLIB@ | 201 | RANLIB = @RANLIB@ |
@@ -214,6 +212,8 @@ VALGRIND_CFLAGS = @VALGRIND_CFLAGS@ | |||
214 | VALGRIND_LIBS = @VALGRIND_LIBS@ | 212 | VALGRIND_LIBS = @VALGRIND_LIBS@ |
215 | VERSION = @VERSION@ | 213 | VERSION = @VERSION@ |
216 | VMAJ = @VMAJ@ | 214 | VMAJ = @VMAJ@ |
215 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | ||
216 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | ||
217 | WIN32_CFLAGS = @WIN32_CFLAGS@ | 217 | WIN32_CFLAGS = @WIN32_CFLAGS@ |
218 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | 218 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ |
219 | XCB_CFLAGS = @XCB_CFLAGS@ | 219 | XCB_CFLAGS = @XCB_CFLAGS@ |
@@ -295,6 +295,10 @@ evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | |||
295 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 295 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
296 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 296 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
297 | evas_engine_software_xlib_libs = @evas_engine_software_xlib_libs@ | 297 | evas_engine_software_xlib_libs = @evas_engine_software_xlib_libs@ |
298 | evas_engine_wayland_egl_cflags = @evas_engine_wayland_egl_cflags@ | ||
299 | evas_engine_wayland_egl_libs = @evas_engine_wayland_egl_libs@ | ||
300 | evas_engine_wayland_shm_cflags = @evas_engine_wayland_shm_cflags@ | ||
301 | evas_engine_wayland_shm_libs = @evas_engine_wayland_shm_libs@ | ||
298 | evas_image_loader_bmp_cflags = @evas_image_loader_bmp_cflags@ | 302 | evas_image_loader_bmp_cflags = @evas_image_loader_bmp_cflags@ |
299 | evas_image_loader_bmp_libs = @evas_image_loader_bmp_libs@ | 303 | evas_image_loader_bmp_libs = @evas_image_loader_bmp_libs@ |
300 | evas_image_loader_edb_cflags = @evas_image_loader_edb_cflags@ | 304 | evas_image_loader_edb_cflags = @evas_image_loader_edb_cflags@ |
diff --git a/libraries/evas/src/lib/file/evas_module.c b/libraries/evas/src/lib/file/evas_module.c index 6b4d4f6..21d5cd0 100644 --- a/libraries/evas/src/lib/file/evas_module.c +++ b/libraries/evas/src/lib/file/evas_module.c | |||
@@ -285,7 +285,7 @@ evas_module_register(const Evas_Module_Api *module, Evas_Module_Type type) | |||
285 | if (type == EVAS_MODULE_TYPE_ENGINE) | 285 | if (type == EVAS_MODULE_TYPE_ENGINE) |
286 | { | 286 | { |
287 | eina_array_push(evas_engines, em); | 287 | eina_array_push(evas_engines, em); |
288 | em->id_engine = eina_array_count_get(evas_engines); | 288 | em->id_engine = eina_array_count(evas_engines); |
289 | } | 289 | } |
290 | 290 | ||
291 | eina_hash_direct_add(evas_modules[type], module->name, em); | 291 | eina_hash_direct_add(evas_modules[type], module->name, em); |
@@ -398,7 +398,7 @@ Evas_Module * | |||
398 | evas_module_engine_get(int render_method) | 398 | evas_module_engine_get(int render_method) |
399 | { | 399 | { |
400 | if ((render_method <= 0) || | 400 | if ((render_method <= 0) || |
401 | ((unsigned int)render_method > eina_array_count_get(evas_engines))) | 401 | ((unsigned int)render_method > eina_array_count(evas_engines))) |
402 | return NULL; | 402 | return NULL; |
403 | return eina_array_data_get(evas_engines, render_method - 1); | 403 | return eina_array_data_get(evas_engines, render_method - 1); |
404 | } | 404 | } |
diff --git a/libraries/evas/src/lib/file/evas_path.c b/libraries/evas/src/lib/file/evas_path.c index ff13e20..c663c16 100644 --- a/libraries/evas/src/lib/file/evas_path.c +++ b/libraries/evas/src/lib/file/evas_path.c | |||
@@ -123,7 +123,7 @@ evas_file_path_list(char *path, const char *match, int match_case) | |||
123 | else | 123 | else |
124 | files = eina_list_append(files, strdup(info->path + info->name_start)); | 124 | files = eina_list_append(files, strdup(info->path + info->name_start)); |
125 | } | 125 | } |
126 | eina_iterator_free(it); | 126 | if (it) eina_iterator_free(it); |
127 | return files; | 127 | return files; |
128 | } | 128 | } |
129 | 129 | ||