diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-01-10 17:33:17 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-01-10 17:33:17 +0000 |
| commit | 1990d5fb5ca844ef3c09bb0b177f3bc1ced3d924 (patch) | |
| tree | 413b147e552443eae7de52faa7c999543babae13 /wiretap/ascend-scanner.l | |
| parent | 9fe38ca2b5dc37b9f47ea3f047a0b079b47c4459 (diff) | |
Some initial changes for win32 support, but not all.
Added lots of #ifdef HAVE_*_H wrappers.
Added some #defines in config.h.win32
Check for more headers in configure.in
Added prototype for inet_aton() in inet_v6defs.h.
Changed "BYTE" token (i.e., #define) in ascend-gramamr.y because it
conflicts with a windows definition. Use HEXBYTE instead.
svn path=/trunk/; revision=1448
Diffstat (limited to 'wiretap/ascend-scanner.l')
| -rw-r--r-- | wiretap/ascend-scanner.l | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/wiretap/ascend-scanner.l b/wiretap/ascend-scanner.l index 2ed89de7c2..bb09b69912 100644 --- a/wiretap/ascend-scanner.l +++ b/wiretap/ascend-scanner.l @@ -1,7 +1,7 @@ %{ /* ascend-scanner.l * - * $Id: ascend-scanner.l,v 1.9 1999/11/24 19:29:45 guy Exp $ + * $Id: ascend-scanner.l,v 1.10 2000/01/10 17:33:16 gram Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@verdict.uthscsa.edu> @@ -29,6 +29,11 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif + +#ifdef HAVE_IO_H +#include <io.h> /* for isatty() on win32 */ +#endif + #include "wtap.h" #include "ascend.h" #include "ascend-grammar.h" @@ -151,7 +156,7 @@ WDD_TYPE "type "[^\n\r\t ]+ <sc_gen_byte>{H}{2} { ascendlval.b = strtol(ascendtext, NULL, 16); - return BYTE; + return HEXBYTE; } <INITIAL,sc_gen_byte>{WDD_DATE} { |