--- ./lib/number.c.orig	2000-10-03 13:34:25.000000000 -0500
+++ ./lib/number.c	2010-02-28 16:41:43.000000000 -0600
@@ -34,6 +34,7 @@
 #include <number.h>
 #include <assert.h>
 #include <stdlib.h>
+#include <string.h>
 #include <ctype.h>/* Prototypes needed for external utility routines. */
 
 #define bc_rt_warn rt_warn
--- ./configure.orig	2000-10-03 13:34:24.000000000 -0500
+++ ./configure	2010-02-28 16:50:22.000000000 -0600
@@ -2245,7 +2245,7 @@
 
 
 if test "$LEX" = "flex" ; then
- LEX="flex -I8"
+ LEX="flex -I -8"
 else
  if test "$bcrl" = "y" ; then
   echo "configure: warning: readline works only with flex." 1>&2
--- ./bc/load.c.orig	2000-09-13 13:22:38.000000000 -0500
+++ ./bc/load.c	2010-02-28 16:42:51.000000000 -0600
@@ -156,7 +156,7 @@
   long  label_no;
   long  vaf_name;	/* variable, array or function number. */
   long  func;
-  program_counter save_adr;
+  static program_counter save_adr;
 
   /* Initialize. */
   str = code;
--- ./bc/scan.l.orig	2000-09-13 13:25:47.000000000 -0500
+++ ./bc/scan.l	2010-02-28 16:49:30.000000000 -0600
@@ -143,7 +143,6 @@
 
 /* Definitions for readline access. */
 extern FILE *rl_instream;
-_PROTOTYPE(char *readline, (char *));
 
 /* rl_input puts upto MAX characters into BUF with the number put in
    BUF placed in *RESULT.  If the yy input file is the same as