Mercurial > octave

changeset 30319:a12b5a32f94b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
oct-conf-post.in.h: Include header that defines __MSVCRT_VERSION__. * oct-conf-post.in.h: Include <_mingw_.h> on mingw, or __MSVCRT_VERSION__ might not be defined.
author Markus Mützel <markus.muetzel@gmx.de>
date Mon, 22 Nov 2021 16:41:21 +0100
parents 08f6fbcd33c6
children c41fec3367b0
files oct-conf-post.in.h
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/oct-conf-post.in.h	Mon Nov 22 15:21:37 2021 +0100
+++ b/oct-conf-post.in.h	Mon Nov 22 16:41:21 2021 +0100
@@ -155,12 +155,16 @@
 #  define OCTAVE_HAVE_POSIX_FILESYSTEM 1
 #endif
 
+#if defined (__MINGW32__)
+  /* We need to include this header or __MSVCRT_VERSION__ might not be defined
+     to the correct value */
+#  include <_mingw.h>
+#endif
 /* assume that Windows will support UTF-8 locales when using UCRT */
 #if defined (__MSVCRT_VERSION__) && __MSVCRT_VERSION__ == 0x0E00
-#  define OCTAVE_HAVE_WINDOWS_UTF8_LOCALE
+#  define OCTAVE_HAVE_WINDOWS_UTF8_LOCALE 1
 #endif
 
-
 /* sigsetjmp is a macro, not a function. */
 #if defined (sigsetjmp) && defined (HAVE_SIGLONGJMP)
 #  define OCTAVE_HAVE_SIG_JUMP 1