diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8b363b4506c..c1567aa8040 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-13  Christopher Faylor  <cgf@cygnus.com>
+
+	* top.c (SIGSETJMP): Protect env argument with parentheses.
+	(SIGLONGJMP): Protect env argument with parentheses.
+
 2001-08-11  Andrew Cagney  <ac131313@redhat.com>
 
 	* config/mn10300/mn10300.mt (TM_FILE): Delete.
diff --git a/gdb/top.c b/gdb/top.c
index 061bef87bf2..33a853b7d3d 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -299,12 +299,12 @@ NORETURN void (*error_hook) (void) ATTR_NORETURN;
    directly.  */
 #if defined(HAVE_SIGSETJMP)
 #define SIGJMP_BUF		sigjmp_buf
-#define SIGSETJMP(buf)		sigsetjmp(buf, 1)
-#define SIGLONGJMP(buf,val)	siglongjmp(buf,val)
+#define SIGSETJMP(buf)		sigsetjmp((buf), 1)
+#define SIGLONGJMP(buf,val)	siglongjmp((buf), (val))
 #else
 #define SIGJMP_BUF		jmp_buf
 #define SIGSETJMP(buf)		setjmp(buf)
-#define SIGLONGJMP(buf,val)	longjmp(buf,val)
+#define SIGLONGJMP(buf,val)	longjmp((buf), (val))
 #endif
 
 /* Where to go for return_to_top_level.  */