Bin outdated #if and unnecessary <config_mingw.h>

We don't support cross-compiling with MinGW currently, and in any case
if we ever attempt such again, in the meantime the free replacement
Win32 headers most likely have been updated to include the
SCRIPT_CONTROL::fMergeNeutralItems field, so no conditional
compilation is needed.

Change-Id: I38701d6c41c44952466c1ece7c8433abe67642be

config_host/config_mingw.h.in

-#ifndef CONFIG_MINGW
-#define CONFIG_MINGW
-
-#define HAVE_FMERGENEUTRALITEMS 0
-
-#endif

configure.ac

@@ -5841,27 +5841,6 @@ using namespace std;
     AC_SUBST(MINGW_GXXDLL)
 fi
 
-if test "$_os" = "WINNT" -a "$WITH_MINGW" != "yes"; then
-    AC_DEFINE(HAVE_FMERGENEUTRALITEMS)
-fi
-
-if test "$WITH_MINGW" = "yes"; then
-    AC_MSG_CHECKING([for fMergeNeutralItems in SCRIPT_CONTROL])
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-    [
-    #include <usp10.h>
-    ],
-    [
-    SCRIPT_CONTROL c;
-    c.fMergeNeutralItems = 1;
-    ])],
-    [
-    AC_MSG_RESULT(yes)
-    AC_DEFINE(HAVE_FMERGENEUTRALITEMS)
-    ],
-    [AC_MSG_RESULT(no)])
-fi
-
 dnl *************************************************************
 dnl Testing for exception handling - dwarf2 or sjlj exceptions...
 dnl *************************************************************
@@ -12970,7 +12949,6 @@ AC_CONFIG_HEADERS([config_host/config_locales.h])
 AC_CONFIG_HEADERS([config_host/config_mpl.h])
 AC_CONFIG_HEADERS([config_host/config_orcus.h])
 AC_CONFIG_HEADERS([config_host/config_kde4.h])
-AC_CONFIG_HEADERS([config_host/config_mingw.h])
 AC_CONFIG_HEADERS([config_host/config_oox.h])
 AC_CONFIG_HEADERS([config_host/config_opengl.h])
 AC_CONFIG_HEADERS([config_host/config_options.h])

vcl/win/source/gdi/winlayout.cxx

@@ -56,8 +56,6 @@
 
 #define DROPPED_OUTGLYPH 0xFFFF
 
-#include <config_mingw.h>
-
 namespace
 {
 // Extra space at the top and bottom of the glyph in total = tmHeight / GLYPH_SPACE_RATIO;
@@ -866,9 +864,8 @@ bool UniscribeLayout::LayoutText( ImplLayoutArgs& rArgs )
     SCRIPT_CONTROL aScriptControl = {nLangId,false,false,false,false,false,false,false,false,0};
     aScriptControl.fNeutralOverride = aScriptState.fOverrideDirection;
     aScriptControl.fContextDigits   = bool(rArgs.mnFlags & SalLayoutFlags::SubstituteDigits);
-#if HAVE_FMERGENEUTRALITEMS
     aScriptControl.fMergeNeutralItems = true;
-#endif
+
     // determine relevant substring and work only on it
     // when Bidi status is unknown we need to look at the whole string though
     mnSubStringMin = 0;