diff options
| author | mmcc <mmcc@cvs.openbsd.org> | 2015-10-21 14:30:44 +0000 |
|---|---|---|
| committer | mmcc <mmcc@cvs.openbsd.org> | 2015-10-21 14:30:44 +0000 |
| commit | 80f6e28b0334496fc6ed1c1d142bc2df335913ac (patch) | |
| tree | 69d819d475d8ec47ce4c2b1d38fb4716609e8a62 /bin/ksh/sh.h | |
| parent | 54f1eaae8725d5e9a1a094efd333b78979077670 (diff) | |
Penultimate commit to remove EXTERN.
ok nicm@
Diffstat (limited to 'bin/ksh/sh.h')
| -rw-r--r-- | bin/ksh/sh.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/bin/ksh/sh.h b/bin/ksh/sh.h index d7681607ead..80c9b6fcf46 100644 --- a/bin/ksh/sh.h +++ b/bin/ksh/sh.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sh.h,v 1.46 2015/10/19 17:15:53 mmcc Exp $ */ +/* $OpenBSD: sh.h,v 1.47 2015/10/21 14:30:43 mmcc Exp $ */ /* * Public Domain Bourne/Korn shell @@ -203,7 +203,7 @@ enum sh_flag { extern char shell_flags[FNFLAGS]; -EXTERN char null [] I__(""); /* null value for variable */ +extern char null[]; /* null value for variable */ enum temp_type { TT_HEREDOC_EXP, /* expanded heredoc */ @@ -226,7 +226,7 @@ struct temp { #define shl_spare (&shf_iob[0]) /* for c_read()/c_print() */ #define shl_stdout (&shf_iob[1]) #define shl_out (&shf_iob[2]) -EXTERN int shl_stdout_ok; +extern int shl_stdout_ok; /* * trap handlers @@ -267,9 +267,9 @@ typedef struct trap { #define SIGEXIT_ 0 /* for trap EXIT */ #define SIGERR_ NSIG /* for trap ERR */ -EXTERN volatile sig_atomic_t trap; /* traps pending? */ -EXTERN volatile sig_atomic_t intrsig; /* pending trap interrupts command */ -EXTERN volatile sig_atomic_t fatal_trap;/* received a fatal signal */ +extern volatile sig_atomic_t trap; /* traps pending? */ +extern volatile sig_atomic_t intrsig; /* pending trap interrupts command */ +extern volatile sig_atomic_t fatal_trap; /* received a fatal signal */ extern volatile sig_atomic_t got_sigwinch; extern Trap sigtraps[NSIG+1]; @@ -282,11 +282,11 @@ enum tmout_enum { TMOUT_READING, /* waiting for input */ TMOUT_LEAVING /* have timed out */ }; -EXTERN unsigned int ksh_tmout; -EXTERN enum tmout_enum ksh_tmout_state I__(TMOUT_EXECUTING); +extern unsigned int ksh_tmout; +extern enum tmout_enum ksh_tmout_state; /* For "You have stopped jobs" message */ -EXTERN int really_exit; +extern int really_exit; /* * fast character classes @@ -308,7 +308,7 @@ extern short ctypes []; #define digit(c) ctype(c, C_DIGIT) #define letnum(c) ctype(c, C_ALPHA|C_DIGIT) -EXTERN int ifs0 I__(' '); /* for "$*" */ +extern int ifs0; /* for "$*" */ /* Argument parsing for built-in commands and getopts command */ @@ -332,8 +332,8 @@ typedef struct { char buf[2]; /* for bad option OPTARG value */ } Getopt; -EXTERN Getopt builtin_opt; /* for shell builtin commands */ -EXTERN Getopt user_opt; /* parsing state for getopts builtin command */ +extern Getopt builtin_opt; /* for shell builtin commands */ +extern Getopt user_opt; /* parsing state for getopts builtin command */ /* This for co-processes */ |