diff libinterp/corefcn/sysdep.cc @ 21556:12f207a534aa

maint: merge stable to default.
author John W. Eaton <jwe@octave.org>
date Mon, 28 Mar 2016 22:56:18 -0400
parents 40de9f8f23a6 9f0088f3f335
children f6663c49870c
line wrap: on
line diff
--- a/libinterp/corefcn/sysdep.cc	Mon Mar 28 22:53:27 2016 -0400
+++ b/libinterp/corefcn/sysdep.cc	Mon Mar 28 22:56:18 2016 -0400
@@ -60,6 +60,10 @@
 #  include <ieeefp.h>
 #endif
 
+#if defined (HAVE_OMP_H)
+#  include <omp.h>
+#endif
+
 #include "cmd-edit.h"
 #include "file-ops.h"
 #include "lo-mappers.h"
@@ -309,6 +313,10 @@
 void
 sysdep_init (void)
 {
+#if defined (HAVE_OMP_GET_NUM_THREADS)
+  omp_get_num_threads ();
+#endif
+
 #if defined (__386BSD__) || defined (__FreeBSD__) || defined (__NetBSD__)
   BSD_init ();
 #elif defined (__MINGW32__)