aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--wiretap/Makefile.am3
-rw-r--r--wiretap/ascend-grammar.y3
-rw-r--r--wiretap/ascend-int.h42
-rw-r--r--wiretap/ascend-scanner.l3
4 files changed, 48 insertions, 3 deletions
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index 532a37feba..84d811dc5c 100644
--- a/wiretap/Makefile.am
+++ b/wiretap/Makefile.am
@@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Wiretap
#
-# $Id: Makefile.am,v 1.21 1999/09/24 04:59:52 gram Exp $
+# $Id: Makefile.am,v 1.22 1999/10/08 07:41:31 guy Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@zing.org>
@@ -35,6 +35,7 @@ libwiretap_a_SOURCES = \
ascend-scanner.l \
ascend.c \
ascend.h \
+ ascend-int.h \
buffer.c \
buffer.h \
file.c \
diff --git a/wiretap/ascend-grammar.y b/wiretap/ascend-grammar.y
index 3c4c8c4747..ceb034b8f8 100644
--- a/wiretap/ascend-grammar.y
+++ b/wiretap/ascend-grammar.y
@@ -1,6 +1,6 @@
/* ascend-grammar.y
*
- * $Id: ascend-grammar.y,v 1.5 1999/09/23 05:25:14 guy Exp $
+ * $Id: ascend-grammar.y,v 1.6 1999/10/08 07:41:32 guy Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@verdict.uthscsa.edu>
@@ -59,6 +59,7 @@ WD_DIALOUT_DISP: chunk 2515EE type IP.
#include "wtap.h"
#include "buffer.h"
#include "ascend.h"
+#include "ascend-int.h"
#define NFH_PATH "/dev/null"
diff --git a/wiretap/ascend-int.h b/wiretap/ascend-int.h
new file mode 100644
index 0000000000..2fbc08cbdc
--- /dev/null
+++ b/wiretap/ascend-int.h
@@ -0,0 +1,42 @@
+/* ascend-int.h
+ * 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.1 1999/10/08 07:41:33 guy Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __ASCEND_INT_H__
+#define __ASCEND_INT_H__
+
+/* 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);
+
+#endif /* ! __ASCEND_INT_H__ */
diff --git a/wiretap/ascend-scanner.l b/wiretap/ascend-scanner.l
index 4ec358840e..46ee15f6c5 100644
--- a/wiretap/ascend-scanner.l
+++ b/wiretap/ascend-scanner.l
@@ -1,7 +1,7 @@
%{
/* ascend-scanner.l
*
- * $Id: ascend-scanner.l,v 1.6 1999/09/23 05:25:14 guy Exp $
+ * $Id: ascend-scanner.l,v 1.7 1999/10/08 07:41:31 guy Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@verdict.uthscsa.edu>
@@ -32,6 +32,7 @@
#include "wtap.h"
#include "ascend.h"
#include "ascend-grammar.h"
+#include "ascend-int.h"
#include "file.h"
void *yy_fh;