2 files changed, 2 insertions, 5 deletions
diff --git a/runoff b/runoff
index 8db9bcc..f2cbc01 100755
--- a/runoff
+++ b/runoff
@@ -127,9 +127,8 @@ perl -e '
 			next;
 		}
 
-		if (/^([0-9]+) (((static|struct|extern|union|enum) +)*([A-Za-z0-9_]+))( .*)? +([A-Za-z_][A-Za-z0-9_]*)[,;]/) {
-		
-			print "$1 $7\n"
+		if (/^([0-9]+) (((static|struct|extern|union|enum) +)*([A-Za-z0-9_]+))( .*)? +([A-Za-z_][A-Za-z0-9_]*)(,|;|=| =)/) {
+			print "$1 $7\n";
 		}
 		
 		elsif(/^([0-9]+) (enum|struct|union) +([A-Za-z0-9_]+) +{/){ 
diff --git a/spinlock.c b/spinlock.c
index 5f04dcf..183e730 100644
--- a/spinlock.c
+++ b/spinlock.c
@@ -8,8 +8,6 @@
 #include "proc.h"
 #include "spinlock.h"
 
-extern int use_console_lock;
-
 void
 initlock(struct spinlock *lock, char *name)
 {