diff options
| author | iains <iains@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-01-09 12:41:33 +0000 |
|---|---|---|
| committer | iains <iains@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-01-09 12:41:33 +0000 |
| commit | bbcdd32763124d307512585ce272d61b7bfeddd6 (patch) | |
| tree | bec947dc3d9b40739c6aa9483adc0bc42e052059 | |
| parent | cf25639386302ba6401b9fd891ef8f3dd62a1824 (diff) | |
| download | gcc-bbcdd32763124d307512585ce272d61b7bfeddd6.tar.gz | |
PR gcc/46902
PR testsuite/46912
* plugin.c: Move include of dlfcn.h from here...
* system.h: ... to here.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168611 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/plugin.c | 9 | ||||
| -rw-r--r-- | gcc/system.h | 5 |
3 files changed, 13 insertions, 10 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e9bee6d61c3..0bb8b7ea1c1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,4 +1,11 @@ -2010-01-09 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> +2011-01-09 Iain Sandoe <iains@gcc.gnu.org> + + PR gcc/46902 + PR testsuite/46912 + * plugin.c: Move include of dlfcn.h from here... + * system.h: ... to here. + +2011-01-09 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> * doc/cpp.texi (C++ Named Operators): Fix markup for header file name. diff --git a/gcc/plugin.c b/gcc/plugin.c index 2179b819288..c93daed055d 100644 --- a/gcc/plugin.c +++ b/gcc/plugin.c @@ -22,15 +22,6 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" - -/* If plugin support is not enabled, do not try to execute any code - that may reference libdl. The generic code is still compiled in to - avoid including too many conditional compilation paths in the rest - of the compiler. */ -#ifdef ENABLE_PLUGIN -#include <dlfcn.h> -#endif - #include "coretypes.h" #include "diagnostic-core.h" #include "tree.h" diff --git a/gcc/system.h b/gcc/system.h index a9a29f16b21..0bf9b925685 100644 --- a/gcc/system.h +++ b/gcc/system.h @@ -583,6 +583,11 @@ extern int vsnprintf(char *, size_t, const char *, va_list); # endif #endif +#if defined (ENABLE_PLUGIN) && defined (HAVE_DLFCN_H) +/* If plugin support is enabled, we could use libdl. */ +#include <dlfcn.h> +#endif + /* Get libiberty declarations. */ #include "libiberty.h" |