diff options
author | Jari Aalto <jari.aalto@cante.net> | 2002-07-17 14:10:11 +0000 |
---|---|---|
committer | Jari Aalto <jari.aalto@cante.net> | 2009-09-12 16:46:55 +0000 |
commit | 7117c2d221b2aed4ede8600f6a36b7c1454b4f55 (patch) | |
tree | b792f26ecca68813c51ed5ba2e381790758ef31b /shell.h | |
parent | f73dda092b33638d2d5e9c35375f687a607b5403 (diff) | |
download | bash-7117c2d221b2aed4ede8600f6a36b7c1454b4f55.tar.gz |
Imported from ../bash-2.05b.tar.gz.devel-base-dist
Diffstat (limited to 'shell.h')
-rw-r--r-- | shell.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -35,6 +35,7 @@ #include "unwind_prot.h" #include "dispose_cmd.h" #include "make_cmd.h" +#include "ocache.h" #include "subst.h" #include "sig.h" #include "pathnames.h" @@ -86,6 +87,7 @@ extern WORD_LIST *rest_of_args; /* Generalized global variables. */ extern int executing, login_shell; extern int interactive, interactive_shell; +extern int startup_state; /* Structure to pass around that holds a bitmap of file descriptors to close, and the size of that structure. Used in execute_cmd.c. */ @@ -112,7 +114,7 @@ extern struct user_info current_user; /* Force gcc to not clobber X on a longjmp(). Old versions of gcc mangle this badly. */ -#if __GNUC__ == 2 && __GNUC_MINOR__ > 8 +#if (__GNUC__ > 2) || (__GNUC__ == 2 && __GNUC_MINOR__ > 8) # define USE_VAR(x) ((void) &(x)) #else # define USE_VAR(x) |