From b6d40962544d522ac71d42dca804ea686a650f4d Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Mon, 28 Mar 2011 10:27:07 +0000 Subject: [PATCH] * configure.in: Check for windows.h, not Windows.h. * configure: Regenerate. * plugin.c: Include windows.h, not Windows.h. --- ld/ChangeLog | 6 ++++++ ld/configure | 6 +++--- ld/configure.in | 2 +- ld/plugin.c | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 4c43374fb..df4f67f92 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2011-03-28 Joseph Myers + + * 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 * Makefile.in: Regenerate. diff --git a/ld/configure b/ld/configure index f897b692c..9e4cb5780 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 283654553..bd5040ebc 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 d4bbfe785..6a14f22a4 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 +#include #endif /* Report plugin symbols. */ -- 2.11.4.GIT