diff options
| author | Bradley Nicholes <bnicholes@apache.org> | 2002-11-13 21:14:02 +0000 |
|---|---|---|
| committer | Bradley Nicholes <bnicholes@apache.org> | 2002-11-13 21:14:02 +0000 |
| commit | a3fc322d821e06d93f1cfe88908eac12a106f8eb (patch) | |
| tree | 6332f39ff8069d3b1b7178dba88aa06ae752872f /os | |
| parent | 9850da24aa09173f5183678695d1e910f2a96bcc (diff) | |
| download | httpd-a3fc322d821e06d93f1cfe88908eac12a106f8eb.tar.gz | |
Don't hold the Apache screen open when it exits with an error if all of the error
messages are going to a file anyway. In other words, don't hold the screen
open if the -E <filename> command line parameter is used.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97507 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'os')
| -rw-r--r-- | os/netware/os.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/os/netware/os.h b/os/netware/os.h index beec1b6cc4..c60c239269 100644 --- a/os/netware/os.h +++ b/os/netware/os.h @@ -65,7 +65,7 @@ #include <screen.h> -extern int hold_screen_on_exit; /* Indicates whether the screen should be held open on exit*/ +AP_DECLARE_DATA extern int hold_screen_on_exit; /* Indicates whether the screen should be held open on exit*/ #define CASE_BLIND_FILESYSTEM #define NO_WRITEV @@ -73,6 +73,10 @@ extern int hold_screen_on_exit; /* Indicates whether the screen should be held o #define APACHE_MPM_DIR "server/mpm/netware" /* generated on unix */ #define getpid NXThreadGetId -#define exit(s) {if(s||hold_screen_on_exit){pressanykey();}apr_terminate();exit(s);} + +/* Hold the screen open if there is an exit code and the hold_screen_on_exit flag >= 0 or the + hold_screen_on_exit > 0. If the hold_screen_on_exit flag is < 0 then close the screen no + matter what the exit code is. */ +#define exit(s) {if((s||hold_screen_on_exit)&&(hold_screen_on_exit>=0)){pressanykey();}apr_terminate();exit(s);} #endif /* ! APACHE_OS_H */ |