The #defines to turn "yy{lex,error}" into names specific to the

parser/lexical analyzer in question are needed only in the ".c" files
for the generated parser and lexical analyzer, and Flex and Byacc/Bison
put them there; don't bother putting them in a header file, just
directly declare the functions with the right names.

svn path=/trunk/; revision=801

1 files changed, 2 insertions, 11 deletions

diff --git a/wiretap/ascend-int.h b/wiretap/ascend-int.h
index e5c9a75c8f..83994ff5ef 100644
--- a/wiretap/ascend-int.h
+++ b/wiretap/ascend-int.h
@@ -2,7 +2,7 @@
  * Definitions for routines common to multiple modules in the Lucent/Ascend
  * capture file reading code code, but not used outside that code.
  *
- * $Id: ascend-int.h,v 1.2 1999/10/08 07:45:31 guy Exp $
+ * $Id: ascend-int.h,v 1.3 1999/10/10 18:16:43 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -34,17 +34,8 @@ typedef struct {
   guint32 len;
 } ascend_pkthdr;
 
-/* Sigh.  The #defines to replace "yy" with "ascend" in the names of
- * various parser routines appear in the ".c" files generated by Yacc
- * and Flex, *not* in any header files; duplicate them here, but
- * protect them with #ifdef so they're not used in files that define
- * them. */
-#ifndef yylex
-#define yylex ascendlex
-#endif
-
 /* Here we provide interfaces to make our scanner act and look like lex */
-int yylex(void);
+int ascendlex(void);
 
 void init_parse_ascend(void);
 int parse_ascend(FILE *fh, void *pd, struct ascend_phdr *phdr,