diff liboctave/system/lo-sysdep.h @ 21949:baeffde5c87d

fix build for Windows systems * file-stat.cc, oct-syscalls.cc, syscalls.cc: Include <ctime>. * sysdep.cc: Include <shellapi.h> for Windows. * lo-sysdep.cc: Include <fcntl.h> and <io.h> for Windows. * wait-wrappers.c (WIFCONTINUED): Define if sys/wait.h does not. * signal-wrappers.c (octave_kill_wrapper): Return -1 if kill is missing. * main.in.cc (prepare_spawn): Move to unistd-wrappers.c. (octave_exec): Eliminate special case for Windows. (main): Display message if exec fails. * unistd-wrappers.h, fcntl-wrappers.h, lo-sysdep.h: Include <sys/types.h> * unistd-wrappers.c (octave_execv_wrapper): Handle Windows implementation here. Free sanitized command vector if spawnv fails. (octave_getegid_wrapper): Return -1 if getegid is missing. (octave_geteuid_wrapper): Return -1 if geteuid is missing. (octave_getgid_wrapper): Return -1 if getgid is missing. (octave_getpgrp_wrapper): Return -1 if getpgrp is missing. (octave_getpid_wrapper): Return -1 if getpid is missing. (octave_getppid_wrapper): Return -1 if getppid is missing. (octave_getuid_wrapper): Return -1 if getuid is missing. (octave_setsid_wrapper): Return -1 if setsid is missing. * configure.ac: Check for setsid. * lo-sysdep.cc (win_popen2): Move to octave-popen2.c. * lo-sysdep.h (win_popen2): Delete decl. (octave_popen2): Delete deprecated function pointer. * octave-popen2, octave-popen2.c (octave_popen2): New arg, ERRMSG. Handle Windows implemenation here. (make_command_string): New static function. * oct-syscalls.cc (octave::sys::popen2): Eliminate special case for Windows. Defined deprecated inline functions for old octave_popen2 interface. * quit.h: Don't include <windows.h>. (w32_sigint_init, w32_raise_final, w32_raise, w32_in_main_thread): Delete decls of undefined and unused functions. * toplev.cc: Include <windows.h>. * sysdep.cc: Include <windows.h> before <tlhelp32.h> and <shellapi.h>.
author John W. Eaton <jwe@octave.org>
date Sat, 18 Jun 2016 10:55:49 -0400
parents 590c39b94618
children bac0d6f07a3e
line wrap: on
line diff
--- a/liboctave/system/lo-sysdep.h	Fri Jun 17 15:18:58 2016 -0700
+++ b/liboctave/system/lo-sysdep.h	Sat Jun 18 10:55:49 2016 -0400
@@ -27,6 +27,8 @@
 
 #include <string>
 
+#include <sys/types.h>
+
 #include "lo-ieee.h"
 
 class string_vector;
@@ -38,11 +40,6 @@
     extern std::string getcwd (void);
 
     extern int chdir (const std::string&);
-
-#if defined (__WIN32__) && ! defined (__CYGWIN__)
-    extern pid_t win_popen2 (const std::string&, const string_vector&,
-                             bool, int *, std::string&);
-#endif
   }
 }
 
@@ -54,11 +51,6 @@
 OCTAVE_DEPRECATED ("use 'octave::sys::chdir' instead")
 const auto octave_chdir = octave::sys::chdir;
 
-#if defined (__WIN32__) && ! defined (__CYGWIN__)
-OCTAVE_DEPRECATED ("use 'octave::sys::popen2' instead")
-const auto octave_popen2 = octave::sys::win_popen2;
 #endif
 
 #endif
-
-#endif