Mercurial > octave-nkf
changeset 6956:cc712c417943
[project @ 2007-10-04 17:51:57 by jwe]
| author | jwe |
|---|---|
| date | Thu, 04 Oct 2007 17:51:58 +0000 |
| parents | 4aef2ca14cf9 |
| children | 768a19157591 |
| files | src/ChangeLog src/sysdep.cc |
| diffstat | 2 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Oct 04 16:40:17 2007 +0000 +++ b/src/ChangeLog Thu Oct 04 17:51:58 2007 +0000 @@ -1,3 +1,9 @@ +2007-10-04 John W. Eaton <jwe@octave.org> + + * sysdep.cc (w32_set_quiet_shutdown, MINGW_signal_cleanup): Now static. + (w32_set_octave_home, w32_set_quiet_shutdown, MINGW_signal_cleanup): + Only define if defined (__WIN32__) && ! defined (_POSIX_VERSION). + 2007-10-04 Jason Riedy <jason@acm.org> * ls-mat5.cc (read_mat5_binary_data): Map miUTF16 to miUINT16,
--- a/src/sysdep.cc Thu Oct 04 16:40:17 2007 +0000 +++ b/src/sysdep.cc Thu Oct 04 17:51:58 2007 +0000 @@ -109,10 +109,10 @@ } #endif +#if defined (__WIN32__) && ! defined (_POSIX_VERSION) static void w32_set_octave_home (void) { -#if defined (__WIN32__) && ! defined (_POSIX_VERSION) int n = 1024; std::string bin_dir (n, '\0'); @@ -141,23 +141,19 @@ if (pos != NPOS) octave_env::putenv ("OCTAVE_HOME", bin_dir.substr (0, pos)); } -#endif } -void +static void w32_set_quiet_shutdown (void) { -#if defined (__WIN32__) && ! defined (_POSIX_VERSION) // Let the user close the console window or shutdown without the // pesky dialog. // // FIXME -- should this be user configurable? SetProcessShutdownParameters (0x280, SHUTDOWN_NORETRY); -#endif } -#if defined (__WIN32__) && ! defined (_POSIX_VERSION) -void +static void MINGW_signal_cleanup (void) { w32_set_quiet_shutdown ();