From fb28ff9e2af747ec2d77223bb4f8184527b3d5a8 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Tue, 14 Dec 2004 12:29:53 +0000 Subject: [PATCH] * os.C: #include "os_win32.h" for _WIN32. * systemcall.C: The "/n" in "start /min/n" makes no sense under DOS. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9367 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/support/ChangeLog | 7 +++++++ src/support/os.C | 2 +- src/support/systemcall.C | 9 ++++++--- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/support/ChangeLog b/src/support/ChangeLog index 5321f8dda8..7cd6ae0a46 100644 --- a/src/support/ChangeLog +++ b/src/support/ChangeLog @@ -1,3 +1,10 @@ +2004-12-14 Angus Leeming + + * os.C: Add _WIN32 to the #define. + + * systemcall.C (startscript): remove trailing '/n' from request to + start the command in a minimized window under DOS. + 2004-12-14 Angus Leeming * Makefile.am (AM_CPPFLAGS): Remove trailing slash from -Ifoo/ diff --git a/src/support/os.C b/src/support/os.C index 1a76f317ba..2d44db8dd6 100644 --- a/src/support/os.C +++ b/src/support/os.C @@ -12,7 +12,7 @@ #ifdef __EMX__ #include "os_os2.C" -#elif defined(__CYGWIN__) || defined(__CYGWIN32__) +#elif defined(__CYGWIN__) || defined(__CYGWIN32__) || defined(_WIN32) #include "os_win32.C" #else #include "os_unix.C" diff --git a/src/support/systemcall.C b/src/support/systemcall.C index c18e08881f..b879ba4ae5 100644 --- a/src/support/systemcall.C +++ b/src/support/systemcall.C @@ -33,10 +33,13 @@ int Systemcall::startscript(Starttype how, string const & what) string command = what; if (how == DontWait) { - if (os::shell() == os::UNIX) { + switch (os::shell()) { + case os::UNIX: command += " &"; - } else { - command = "start /min/n " + command; + break; + case os::CMD_EXE: + command = "start /min " + command; + break; } }