diff options
| -rw-r--r-- | ld/ChangeLog | 6 | ||||
| -rwxr-xr-x | ld/configure | 6 | ||||
| -rw-r--r-- | ld/configure.in | 2 | ||||
| -rw-r--r-- | ld/plugin.c | 2 |
4 files changed, 11 insertions, 5 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 4c43374fb3d..df4f67f9255 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2011-03-28 Joseph Myers <joseph@codesourcery.com> + + * configure.in: Check for windows.h, not Windows.h. + * configure: Regenerate. + * plugin.c: Include windows.h, not Windows.h. + 2011-03-25 Eric B. Weddington <eric.weddington@atmel.com> * Makefile.in: Regenerate. diff --git a/ld/configure b/ld/configure index f897b692cdd..9e4cb57802a 100755 --- a/ld/configure +++ b/ld/configure @@ -16452,11 +16452,11 @@ done # We also support plugins on Windows (MinGW). if test x$enable_plugins = xno ; then - for ac_header in Windows.h + for ac_header in windows.h do : - ac_fn_c_check_header_compile "$LINENO" "Windows.h" "ac_cv_header_Windows_h" "$ac_includes_default + ac_fn_c_check_header_compile "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default " -if test "x$ac_cv_header_Windows_h" = x""yes; then : +if test "x$ac_cv_header_windows_h" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_WINDOWS_H 1 _ACEOF diff --git a/ld/configure.in b/ld/configure.in index 28365455373..bd5040ebcf8 100644 --- a/ld/configure.in +++ b/ld/configure.in @@ -173,7 +173,7 @@ AC_SEARCH_LIBS([dlopen],[dl],[],[enable_plugins=no],[]) AC_CHECK_FUNCS([dlopen dlsym dlclose],[],[enable_plugins=no]) # We also support plugins on Windows (MinGW). if test x$enable_plugins = xno ; then - AC_CHECK_HEADERS([Windows.h],[enable_plugins=yes],[],[AC_INCLUDES_DEFAULT]) + AC_CHECK_HEADERS([windows.h],[enable_plugins=yes],[],[AC_INCLUDES_DEFAULT]) fi AM_CONDITIONAL([ENABLE_PLUGINS], [test x$enable_plugins = xyes]) diff --git a/ld/plugin.c b/ld/plugin.c index d4bbfe78520..6a14f22a4b5 100644 --- a/ld/plugin.c +++ b/ld/plugin.c @@ -33,7 +33,7 @@ #include "plugin-api.h" #include "elf-bfd.h" #if !defined (HAVE_DLFCN_H) && defined (HAVE_WINDOWS_H) -#include <Windows.h> +#include <windows.h> #endif /* Report plugin symbols. */ |