diff options
| author | vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-12-26 18:17:42 +0000 |
|---|---|---|
| committer | vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-12-26 18:17:42 +0000 |
| commit | d507f94cf4aad6f3f03f478fcba27ec673d8e1d6 (patch) | |
| tree | c23e6a01fc51d8419c1562f70836148c705ac46a /shell | |
| parent | 814481658de0435847aa696c3d748871f1c72122 (diff) | |
| download | busybox-w32-d507f94cf4aad6f3f03f478fcba27ec673d8e1d6.tar.gz busybox-w32-d507f94cf4aad6f3f03f478fcba27ec673d8e1d6.tar.bz2 busybox-w32-d507f94cf4aad6f3f03f478fcba27ec673d8e1d6.zip | |
merge post-1.3.0 fixes
git-svn-id: svn://busybox.net/trunk/busybox@17084 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shell/ash.c b/shell/ash.c index afb9b6a95..dcf77054f 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
| @@ -85,7 +85,7 @@ | |||
| 85 | #ifdef CONFIG_ASH_JOB_CONTROL | 85 | #ifdef CONFIG_ASH_JOB_CONTROL |
| 86 | #define JOBS 1 | 86 | #define JOBS 1 |
| 87 | #else | 87 | #else |
| 88 | #undef JOBS | 88 | #define JOBS 0 |
| 89 | #endif | 89 | #endif |
| 90 | 90 | ||
| 91 | #if JOBS || defined(CONFIG_ASH_READ_NCHARS) | 91 | #if JOBS || defined(CONFIG_ASH_READ_NCHARS) |
| @@ -6647,7 +6647,7 @@ usage: | |||
| 6647 | } | 6647 | } |
| 6648 | #endif /* JOBS */ | 6648 | #endif /* JOBS */ |
| 6649 | 6649 | ||
| 6650 | #if defined(JOBS) || DEBUG | 6650 | #if JOBS || DEBUG |
| 6651 | static int | 6651 | static int |
| 6652 | jobno(const struct job *jp) | 6652 | jobno(const struct job *jp) |
| 6653 | { | 6653 | { |