# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1639624152 18000
# Node ID 358295cdc0a415670f817571ef4df72b79305aa6
# Parent  6fc9847bd302522f34ce15d9fee0dc44a92cd8f2# Parent  ba5370c670d58d19b12cf9c81004be2b61518157
maint: Merge stable to default.

diff -r 6fc9847bd302 -r 358295cdc0a4 libinterp/corefcn/mex.cc
--- a/libinterp/corefcn/mex.cc	Wed Dec 15 21:29:44 2021 -0500
+++ b/libinterp/corefcn/mex.cc	Wed Dec 15 22:09:12 2021 -0500
@@ -40,7 +40,9 @@
 
 #include <limits>
 #include <map>
-#include <memory_resource>
+#if defined (HAVE_STD_PMR_POLYMORPHIC_ALLOCATOR)
+#  include <memory_resource>
+#endif
 #include <set>
 #include <string>
 
@@ -337,7 +339,6 @@
 };
 
 #if defined (HAVE_STD_PMR_POLYMORPHIC_ALLOCATOR)
-#  include <memory_resource>
 
 class mx_memory_resource : public std::pmr::memory_resource
 {
@@ -368,6 +369,7 @@
 // FIXME: Is it OK for the memory resource object to be defined this
 // way?
 static mx_memory_resource the_mx_memory_resource;
+
 #endif
 
 // ------------------------------------------------------------------