summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcracauer <cracauer@FreeBSD.org>1998-08-24 19:15:48 +0000
committercracauer <cracauer@FreeBSD.org>1998-08-24 19:15:48 +0000
commit57a57a05cacca963507bd828a7c90f4289c443e2 (patch)
tree9a75cf48e106bb68a2e7905b5b702f302e832ecd
parent2eb129c515da7de3a15193a9b02c941042f513d3 (diff)
downloadFreeBSD-src-57a57a05cacca963507bd828a7c90f4289c443e2.zip
FreeBSD-src-57a57a05cacca963507bd828a7c90f4289c443e2.tar.gz
Got two volatile sig_atomic_t and int mixed up. Spotted by Gary Palmer.
-rw-r--r--bin/sh/error.c4
-rw-r--r--bin/sh/error.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/bin/sh/error.c b/bin/sh/error.c
index 0464f6e..e690199 100644
--- a/bin/sh/error.c
+++ b/bin/sh/error.c
@@ -39,7 +39,7 @@
static char sccsid[] = "@(#)error.c 8.2 (Berkeley) 5/4/95";
#endif
static const char rcsid[] =
- "$Id: error.c,v 1.10 1998/05/18 06:43:32 charnier Exp $";
+ "$Id: error.c,v 1.11 1998/08/24 10:20:36 cracauer Exp $";
#endif /* not lint */
/*
@@ -64,7 +64,7 @@ static const char rcsid[] =
struct jmploc *handler;
volatile sig_atomic_t exception;
-int suppressint;
+volatile sig_atomic_t suppressint;
volatile sig_atomic_t intpending;
char *commandname;
diff --git a/bin/sh/error.h b/bin/sh/error.h
index eb0f523..eed9c9d 100644
--- a/bin/sh/error.h
+++ b/bin/sh/error.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)error.h 8.2 (Berkeley) 5/4/95
- * $Id: error.h,v 1.7 1997/02/22 13:58:23 peter Exp $
+ * $Id: error.h,v 1.8 1998/08/24 10:20:36 cracauer Exp $
*/
/*
@@ -64,7 +64,7 @@ struct jmploc {
};
extern struct jmploc *handler;
-extern int exception;
+extern volatile sig_atomic_t exception;
/* exceptions */
#define EXINT 0 /* SIGINT received */
OpenPOWER on IntegriCloud