2 files changed, 14 insertions, 25 deletions
diff --git a/src/backend/bootstrap/bootscanner.l b/src/backend/bootstrap/bootscanner.l
index 6261e8fc81b..ac94d0001bc 100644
--- a/src/backend/bootstrap/bootscanner.l
+++ b/src/backend/bootstrap/bootscanner.l
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootscanner.l,v 1.24 2002/06/20 20:29:26 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootscanner.l,v 1.25 2002/07/30 16:33:08 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -42,18 +42,18 @@
 
 #include "bootstrap_tokens.h"
 
-#define			YY_NO_UNPUT
-
-/* some versions of lex define this as a macro */
-#if defined(yywrap)
-#undef yywrap
-#endif /* yywrap */
 
 YYSTYPE yylval;
 int		yyline;  /* keep track of the line number for error reporting */
 
 %}
 
+%option 8bit
+%option never-interactive
+%option nounput
+%option noyywrap
+
+
 D		[0-9]
 oct		\\{D}{D}{D}
 Exp		[Ee][-+]?{D}+
@@ -132,12 +132,6 @@ insert			{ return(INSERT_TUPLE); }
 
 %%
 
-int
-yywrap(void)
-{
-	return 1;
-}
-
 void
 yyerror(const char *str)
 {
diff --git a/src/backend/utils/misc/guc-file.l b/src/backend/utils/misc/guc-file.l
index 2f50b4b55c6..48658a3cb2c 100644
--- a/src/backend/utils/misc/guc-file.l
+++ b/src/backend/utils/misc/guc-file.l
@@ -4,7 +4,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc-file.l,v 1.12 2002/05/17 01:19:18 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc-file.l,v 1.13 2002/07/30 16:33:08 tgl Exp $
  */
 
 %{
@@ -38,18 +38,19 @@ enum {
 	GUC_ERROR = 100
 };
 
-#if defined(yywrap)
-#undef yywrap
-#endif /* yywrap */
-
 #define YY_USER_INIT (ConfigFileLineno = 1)
-#define YY_NO_UNPUT
 
 /* prototype, so compiler is happy with our high warnings setting */
 int GUC_yylex(void);
 char *GUC_scanstr(char *);
 %}
 
+%option 8bit
+%option never-interactive
+%option nounput
+%option noyywrap
+
+
 SIGN            ("-"|"+")
 DIGIT           [0-9]
 HEXDIGIT        [0-9a-fA-F]
@@ -271,12 +272,6 @@ ProcessConfigFile(GucContext context)
 
 
 
-int
-yywrap(void)
-{
-	return 1;
-}
-
 /* ----------------
  *		scanstr
  *