diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-11-24 12:55:06 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-11-24 12:58:57 +0200 |
| commit | 81d9f1cbd634e54719dd288c5b0de2015d563b2a (patch) | |
| tree | 69c27c4e8dfd98a1bb661f082f1beca1cd590903 | |
| parent | bbbef1568bfced7fd351a8df15cc5d8f227b3ace (diff) | |
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
| -rw-r--r-- | config_host/config_mingw.h.in | 6 | ||||
| -rw-r--r-- | configure.ac | 22 | ||||
| -rw-r--r-- | vcl/win/source/gdi/winlayout.cxx | 5 |
3 files changed, 1 insertions, 32 deletions
diff --git a/config_host/config_mingw.h.in b/config_host/config_mingw.h.in deleted file mode 100644 index 44d0ac929210..000000000000 --- a/config_host/config_mingw.h.in +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef CONFIG_MINGW -#define CONFIG_MINGW - -#define HAVE_FMERGENEUTRALITEMS 0 - -#endif diff --git a/configure.ac b/configure.ac index fd5e1ec4e791..5e52434eef85 100644 --- a/configure.ac +++ b/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]) diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index 980daa8ffae2..23fd8be33340 100644 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/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; |