diff options
| author | Paul Smith <psmith@gnu.org> | 2023-01-16 00:24:13 -0500 |
|---|---|---|
| committer | Paul Smith <psmith@gnu.org> | 2023-01-16 00:24:13 -0500 |
| commit | 9b9f3351d1294b8e6d11f339f7b47d705c69e64f (patch) | |
| tree | 89ba7ef3fedd86aef0a401191193175638e73ba6 /src/variable.c | |
| parent | 6f3e9e9b844cf5e9cd95e9af9ae5fa9409993bd7 (diff) | |
| download | make-git-9b9f3351d1294b8e6d11f339f7b47d705c69e64f.tar.gz | |
Use MK_OS_OS2 macro instead of __EMX__
* src/makeint.h: Set MK_OS_OS2 to 1 if __EMX__ is set.
* src/*: Convert #if refs to __EMX__, to use MK_OS_OS2.
Diffstat (limited to 'src/variable.c')
| -rw-r--r-- | src/variable.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/variable.c b/src/variable.c index 269d229b..cfb7dc03 100644 --- a/src/variable.c +++ b/src/variable.c @@ -893,7 +893,7 @@ define_automatic_variables (void) (void) define_variable (shell_str, shlen, comp->value, o_env, 0); } } -#elif defined(__EMX__) +#elif MK_OS_OS2 { static char shell_str[] = "SHELL"; const int shlen = sizeof (shell_str) - 1; @@ -954,7 +954,7 @@ define_automatic_variables (void) environment variable on MSDOS, so whoever sets it, does that on purpose. On OS/2 we do not use SHELL from environment but we have already handled that problem above. */ -#if !MK_OS_DOS && !defined(__EMX__) +#if !MK_OS_DOS && !MK_OS_OS2 /* Don't let SHELL come from the environment. */ if (*v->value == '\0' || v->origin == o_env || v->origin == o_env_override) { |