Fix macro order, and quote question mark.

[bsdgames-darwin.git] / atc / lex.l

diff --git a/atc/lex.l b/atc/lex.l
index 325b3e689c1e0fafbfd415a3713e022fe1bb6820..864d5473d7d45b5311278420eee7566eff8f5493 100644 (file)
--- a/atc/lex.l
+++ b/atc/lex.l
@@ -1,7 +1,9 @@
 %{
+/*     $NetBSD: lex.l,v 1.6 1998/04/09 00:32:32 tv Exp $       */
+
 /*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1990, 1993
+ *     The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Ed James.
@@ -44,12 +46,19 @@
  * For more info on this and all of my stuff, mail edjames@berkeley.edu.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-/*static char sccsid[] = "from: @(#)lex.l      5.2 (Berkeley) 4/30/90";*/
-static char rcsid[] = "$Id: lex.l,v 1.2 1993/08/01 18:57:07 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)lex.l      8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: lex.l,v 1.6 1998/04/09 00:32:32 tv Exp $");
+#endif
 #endif /* not lint */
 
-#include "y.tab.h"
+#include "include.h"
+#undef ECHO            /* XXX: work around lex(1) vs termios lameness */
+#include "grammar.h"
+
 extern int     line;
 
 %}