Some files include dlfcn.h but don't need to, and others include it all the time instead of only when needed. This breaks building on systems that lack dynamic library support.
Signed-off-by: Mike Frysinger <vap...@gentoo.org> --- lib/direct/interface.c | 4 +--- src/core/core.c | 5 ++++- systems/vnc/vncinput.c | 1 - 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/direct/interface.c b/lib/direct/interface.c index d8235a6..3460ba3 100644 --- a/lib/direct/interface.c +++ b/lib/direct/interface.c @@ -30,9 +30,6 @@ #include <pthread.h> #include <dirent.h> -#ifndef USE_KOS -#include <dlfcn.h> -#endif #include <stdio.h> #include <stdlib.h> #include <errno.h> @@ -51,6 +48,7 @@ #ifdef PIC #define DYNAMIC_LINKING +#include <dlfcn.h> #endif diff --git a/src/core/core.c b/src/core/core.c index ca20152..6905ba1 100644 --- a/src/core/core.c +++ b/src/core/core.c @@ -31,7 +31,6 @@ #include <stdlib.h> #include <unistd.h> #include <dirent.h> -#include <dlfcn.h> #include <errno.h> #include <pthread.h> @@ -73,6 +72,10 @@ #include <misc/conf.h> #include <misc/util.h> +#if defined(DFB_DYNAMIC_LINKING) && defined(SOPATH) +#include <dlfcn.h> +#endif + D_DEBUG_DOMAIN( DirectFB_Core, "DirectFB/Core", "DirectFB Core" ); /******************************************************************************/ diff --git a/systems/vnc/vncinput.c b/systems/vnc/vncinput.c index b12b150..d201322 100644 --- a/systems/vnc/vncinput.c +++ b/systems/vnc/vncinput.c @@ -19,7 +19,6 @@ #include <stdio.h> #include <stdlib.h> -#include <dlfcn.h> #include <directfb.h> -- 1.6.5.rc1 _______________________________________________ directfb-dev mailing list directfb-dev@directfb.org http://mail.directfb.org/cgi-bin/mailman/listinfo/directfb-dev
