2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3afe57dc..c39081c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-11-25  Kaz Kylheku  <kkylheku@gmail.com>
 
+	* parser.y (grammar): Fixes for bison 2.4.1. Remove superfluous action
+	in chrlit.  Include <stdlib.h> for abort.
+
+2009-11-25  Kaz Kylheku  <kkylheku@gmail.com>
+
 	Refinements to Valgrind support.
 
 	* gc.c (mark_mem_region): If a pointer from the stack is valid
diff --git a/parser.y b/parser.y
index b1242251..abac6c00 100644
--- a/parser.y
+++ b/parser.y
@@ -30,7 +30,7 @@
 #include <assert.h>
 #include <limits.h>
 #include <dirent.h>
-#include <stddef.h>
+#include <stdlib.h>
 #include <wchar.h>
 #include "config.h"
 #include "lib.h"
@@ -515,7 +515,6 @@ strlit : '"' '"'                { $$ = null_string; }
 
 chrlit : '\'' '\''              { $$ = nil;
                                   yyerror("empty character literal"); }
-                                { $$ = nil; }
        | '\'' litchars '\''     { $$ = car($2);
                                   if (cdr($2))
                                     yyerror("multiple characters in "