*: more portability fixes by Dan Fandrich
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
@@ -5042,7 +5042,7 @@ struct redirtab {
|
||||
struct redirtab *next;
|
||||
int nullredirs;
|
||||
int pair_count;
|
||||
struct two_fd_t two_fd[0];
|
||||
struct two_fd_t two_fd[];
|
||||
};
|
||||
#define redirlist (G_var.redirlist)
|
||||
|
||||
|
||||
@@ -54,7 +54,7 @@ struct command {
|
||||
int flags; // exit, suspend, && ||
|
||||
int pid; // pid (or exit code)
|
||||
int argc;
|
||||
char *argv[0];
|
||||
char *argv[];
|
||||
};
|
||||
|
||||
// A collection of processes piped into/waiting on each other.
|
||||
|
||||
@@ -787,7 +787,7 @@ static void xxfree(void *ptr)
|
||||
* HUSH_DEBUG >= 2 prints line number in this file where it was detected.
|
||||
*/
|
||||
#if HUSH_DEBUG < 2
|
||||
# define die_if_script(lineno, fmt...) die_if_script(fmt)
|
||||
# define die_if_script(lineno, ...) die_if_script(__VA_ARGS__)
|
||||
# define syntax_error(lineno, msg) syntax_error(msg)
|
||||
# define syntax_error_at(lineno, msg) syntax_error_at(msg)
|
||||
# define syntax_error_unterm_ch(lineno, ch) syntax_error_unterm_ch(ch)
|
||||
@@ -856,7 +856,7 @@ static void syntax_error_unexpected_ch(unsigned lineno, int ch)
|
||||
# undef syntax_error_unterm_str
|
||||
# undef syntax_error_unexpected_ch
|
||||
#else
|
||||
# define die_if_script(fmt...) die_if_script(__LINE__, fmt)
|
||||
# define die_if_script(...) die_if_script(__LINE__, __VA_ARGS__)
|
||||
# define syntax_error(msg) syntax_error(__LINE__, msg)
|
||||
# define syntax_error_at(msg) syntax_error_at(__LINE__, msg)
|
||||
# define syntax_error_unterm_ch(ch) syntax_error_unterm_ch(__LINE__, ch)
|
||||
|
||||
Reference in New Issue
Block a user