Mercurial > octave

changeset 25655:be7ba25bb5bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix Windows cross-build after 85c3e315bd43. * sysdep.cc: Don't make "get_regkey_value" static (is used in ov-java.cc). Fix ambiguous function name error. * oct-procbuf.cc (open, close): Use function names in octave namespace.
author Markus Mützel <markus.muetzel@gmx.de>
date Sun, 22 Jul 2018 21:04:09 +0200
parents 6541a0de38e1
children fbc2730a653b
files libinterp/corefcn/oct-procbuf.cc libinterp/corefcn/sysdep.cc
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/oct-procbuf.cc	Sat Jul 21 12:49:57 2018 -0700
+++ b/libinterp/corefcn/oct-procbuf.cc	Sun Jul 22 21:04:09 2018 +0200
@@ -78,7 +78,7 @@
   if (is_open ())
     return 0;
 
-  f = (octave_popen (command, (mode & std::ios::in) ? "r" : "w"));
+  f = (octave::popen (command, (mode & std::ios::in) ? "r" : "w"));
 
   if (! f)
     return 0;
@@ -183,7 +183,7 @@
 
   if (f)
     {
-      wstatus = octave_pclose (f);
+      wstatus = octave::pclose (f);
       f = 0;
     }
 
--- a/libinterp/corefcn/sysdep.cc	Sat Jul 21 12:49:57 2018 -0700
+++ b/libinterp/corefcn/sysdep.cc	Sun Jul 22 21:04:09 2018 +0200
@@ -531,7 +531,7 @@
   int pclose (FILE *f)
   {
 #if defined (__MINGW32__) || defined (_MSC_VER)
-    return _pclose (f);
+    return ::_pclose (f);
 #else
     return ::pclose (f);
 #endif
@@ -727,7 +727,7 @@
   RegCloseKey (key);
 }
 
-static LONG
+LONG
 get_regkey_value (HKEY h_rootkey, const std::string subkey,
                   const std::string name, octave_value& value)
 {