diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 66b0e41e3..c0b6b3df8 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-05  Neil Jerram  <neil@ossau.uklinux.net>
+
+	* c-tokenize.lex: #define YY_NO_INPUT.
+
 2008-04-26  Ludovic Courtès  <ludo@gnu.org>
 
 	* read.c (scm_read_sexp): Remove extraneous semi-colon at
diff --git a/libguile/c-tokenize.lex b/libguile/c-tokenize.lex
index 1d9b40b92..938a5d2cf 100644
--- a/libguile/c-tokenize.lex
+++ b/libguile/c-tokenize.lex
@@ -18,7 +18,12 @@ INTQUAL		(l|L|ll|LL|lL|Ll|u|U)
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-  
+
+/* Prevent compilation of static input() function in generated scanner
+   code.  This function is never actually used, and GCC 4.3 will emit
+   an error for that. */
+#define YY_NO_INPUT
+
 int yylex(void);
 
 int yyget_lineno (void);