From 3117b8ca5aa7d963d8d7a9d856bc0e9fad96e9d0 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Mon, 18 Jan 2016 13:48:20 +0900 Subject: [PATCH] win32: Fix compilation due to recent changes in Evil Summary: dlfcn.h is not available anymore on Windows, Evil provides all the necessary declarations. Reviewers: cedric, jpeg Differential Revision: https://phab.enlightenment.org/D3577 @fix --- src/lib/ector/gl/ector_gl_shader.c | 2 -- src/lib/ector/gl/ector_gl_surface.c | 2 -- src/lib/evil/evil_dlfcn.h | 15 +++++++++++---- .../engines/software_generic/evas_native_tbm.c | 2 +- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/lib/ector/gl/ector_gl_shader.c b/src/lib/ector/gl/ector_gl_shader.c index acc366e692..10b5a88204 100644 --- a/src/lib/ector/gl/ector_gl_shader.c +++ b/src/lib/ector/gl/ector_gl_shader.c @@ -5,8 +5,6 @@ #include #include -#include - #include "gl/Ector_GL.h" #include "ector_private.h" #include "ector_gl_private.h" diff --git a/src/lib/ector/gl/ector_gl_surface.c b/src/lib/ector/gl/ector_gl_surface.c index 3397e567ed..e4756ae124 100644 --- a/src/lib/ector/gl/ector_gl_surface.c +++ b/src/lib/ector/gl/ector_gl_surface.c @@ -6,8 +6,6 @@ #include #include -#include - #include "gl/Ector_GL.h" #include "ector_private.h" #include "ector_gl_private.h" diff --git a/src/lib/evil/evil_dlfcn.h b/src/lib/evil/evil_dlfcn.h index 96fd30af80..1c05b1f235 100644 --- a/src/lib/evil/evil_dlfcn.h +++ b/src/lib/evil/evil_dlfcn.h @@ -21,20 +21,27 @@ x * This header provides functions to load and unload dynamic-link * @def RTLD_LAZY * Lazy function call binding. */ -# define RTLD_LAZY 0x00001 /* lazy function call binding */ +# define RTLD_LAZY 0x00001 /* lazy function call binding. Unused */ /** * @def RTLD_NOW * Immediate function call binding. */ -# define RTLD_NOW 0x00002 /* immediate function call binding */ +# define RTLD_NOW 0x00002 /* immediate function call binding. Unused */ /** * @def RTLD_GLOBAL * Symbols in this dlopen'ed obj are visible to other dlopen'ed objs. */ -# define RTLD_GLOBAL 0x00100 /* symbols in this dlopen'ed obj are visible - to other dlopen'ed objs */ +# define RTLD_GLOBAL 0x00004 /* symbols in this dlopen'ed obj are visible + to other dlopen'ed objs. Unused */ + +/** + * @def RTLD_LOCAL + * Symbols in this dlopen'ed obj are not visible to other dlopen'ed objs. + */ +# define RTLD_LOCAL 0x00008 /* symbols in this dlopen'ed obj are not visible + to other dlopen'ed objs. Unused */ /** * @def RTLD_NODELETE diff --git a/src/modules/evas/engines/software_generic/evas_native_tbm.c b/src/modules/evas/engines/software_generic/evas_native_tbm.c index 07b4414859..b6931a99f3 100644 --- a/src/modules/evas/engines/software_generic/evas_native_tbm.c +++ b/src/modules/evas/engines/software_generic/evas_native_tbm.c @@ -2,7 +2,7 @@ #include "evas_private.h" #include "evas_native_common.h" -#ifdef HAVE_DLSYM +#if defined HAVE_DLSYM && ! defined _WIN32 # include /* dlopen,dlclose,etc */ #else # warning native_tbm should not get compiled if dlsym is not found on the system!