# HG changeset patch
# User Markus Mützel <markus.muetzel@gmx.de>
# Date 1639773181 -3600
# Node ID 07ac556286913e1779635e2af547ca72224e43e0
# Parent  cd5836f814b84e56528583e437318d8928e10277# Parent  f79deeded5d35a5bb457461380836eca7d2b1ed5
maint: merge stable to default.

diff -r cd5836f814b8 -r 07ac55628691 build-aux/mk-octave-config-h.sh
--- a/build-aux/mk-octave-config-h.sh	Fri Dec 17 19:41:48 2021 +0100
+++ b/build-aux/mk-octave-config-h.sh	Fri Dec 17 21:33:01 2021 +0100
@@ -181,6 +181,13 @@
 #    define octave_unused_parameter(param) (void) param;
 #  endif
 
+/* Defined to 1 if Octave libraries were built with visibility flags */
+EOF
+
+$SED -n 's/#\(\(undef\|define\) OCTAVE_ENABLE_LIB_VISIBILITY_FLAGS.*$\)/#  \1/p' $config_h_file
+
+cat << EOF
+
 #  if defined (OCTAVE_ENABLE_LIB_VISIBILITY_FLAGS)
 #    if defined (_WIN32) || defined (__CYGWIN__)
 #      if defined (__GNUC__)
diff -r cd5836f814b8 -r 07ac55628691 configure.ac
--- a/configure.ac	Fri Dec 17 19:41:48 2021 +0100
+++ b/configure.ac	Fri Dec 17 21:33:01 2021 +0100
@@ -2656,10 +2656,17 @@
      *) AC_MSG_ERROR([bad value $enableval for --enable-lib-visibility-flags]) ;;
    esac])
 
-if test $ENABLE_LIB_VISIBILITY_FLAGS = yes && test $HAVE_VISIBILITY = 0; then
-  AC_MSG_NOTICE([cannot build with visibility flags on this platform])
-  ENABLE_LIB_VISIBILITY_FLAGS=no
-fi
+case $host_os in
+  msdosmsvc | mingw* | cygwin*)
+    # Assume that symbol export is working on that platform
+  ;;
+  *)
+    if test $ENABLE_LIB_VISIBILITY_FLAGS = yes && test $HAVE_VISIBILITY = 0; then
+      AC_MSG_NOTICE([cannot build with visibility flags on this platform])
+      ENABLE_LIB_VISIBILITY_FLAGS=no
+    fi
+  ;;
+esac
 
 if test $ENABLE_LIB_VISIBILITY_FLAGS = yes; then
   AC_DEFINE(OCTAVE_ENABLE_LIB_VISIBILITY_FLAGS, 1,
diff -r cd5836f814b8 -r 07ac55628691 liboctave/util/oct-sort.h
--- a/liboctave/util/oct-sort.h	Fri Dec 17 19:41:48 2021 +0100
+++ b/liboctave/util/oct-sort.h	Fri Dec 17 21:33:01 2021 +0100
@@ -98,6 +98,7 @@
 
 template <typename T>
 class
+OCTARRAY_API
 octave_sort
 {
 public:
@@ -347,10 +348,12 @@
 
 template <typename T>
 class
+OCTARRAY_API
 vec_index
 {
 public:
   T m_vec;
   octave_idx_type m_indx;
 };
+
 #endif