diff options
| author | Chet Ramey <chet.ramey@case.edu> | 2011-12-07 09:10:14 -0500 |
|---|---|---|
| committer | Chet Ramey <chet.ramey@case.edu> | 2011-12-07 09:10:14 -0500 |
| commit | 70694d2e64454909085315102edd4cb09509bef6 (patch) | |
| tree | 4120893d621a787bdc47c7223288978e6aacee50 /variables.c | |
| parent | 234d8729630122c9bac113ed19bd196912c72a1e (diff) | |
| download | bash-70694d2e64454909085315102edd4cb09509bef6.tar.gz | |
commit bash-20070712 snapshot
Diffstat (limited to 'variables.c')
| -rw-r--r-- | variables.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/variables.c b/variables.c index 3bb0ce79..b8645aa3 100644 --- a/variables.c +++ b/variables.c @@ -24,13 +24,13 @@ #include "posixstat.h" #include "posixtime.h" -#if defined (qnx) -# if defined (qnx6) +#if defined (__QNX__) +# if defined (__QNXNTO__) # include <sys/netmgr.h> # else # include <sys/vc.h> -# endif /* !qnx6 */ -#endif /* qnx */ +# endif /* !__QNXNTO__ */ +#endif /* __QNX__ */ #if defined (HAVE_UNISTD_H) # include <unistd.h> @@ -391,11 +391,11 @@ initialize_shell_variables (env, privmode) set_auto_export (temp_var); /* XXX */ #endif -#if defined (qnx) +#if defined (__QNX__) /* set node id -- don't import it from the environment */ { char node_name[22]; -# if defined (qnx6) +# if defined (__QNXNTO__) netmgr_ndtostr(ND2S_LOCAL_STR, ND_LOCAL_NODE, node_name, sizeof(node_name)); # else qnx_nidtostr (getnid (), node_name, sizeof (node_name)); |