diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2013-11-18 17:49:51 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-11-18 13:09:30 -0600 |
| commit | 7cbf4629eadfe0f3da611ee0430a3ab6f2bd33ff (patch) | |
| tree | 9defa0a77620f39f69d5e48bde4c90e9f2ff61e0 /configure.ac | |
| parent | e7a0a1fd6c501b72838a858faaa7b515d1b89845 (diff) | |
fdo#65124 define HAVE_FMERGENEUTRALITEMS for MSVC build
It has been added because mingw headers are missing
fMergeNeutralItems in SCRIPT_CONTROL struct
(see commit f6deda85ef4f28426c09fab7205f274922af3d96),
so there is no apparent reason to disable it for MSVC.
It also resolves fdo#65124.
Change-Id: I4b7381f076c213f12f32cf03e2c0f321ccb1c4ce
Reviewed-on: https://gerrit.libreoffice.org/6711
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 0de54c68eaca..44dcde816d41 100644 --- a/configure.ac +++ b/configure.ac @@ -5665,6 +5665,10 @@ 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( |