diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2013-12-04 07:39:37 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2013-12-04 07:39:37 +0000 |
| commit | c0663d9df5cecf680b6bb9c970faf7bfa9f2448a (patch) | |
| tree | 42cbe060ded23f05174490e45996f4adea1ad48d /ui/text_import_scanner.l | |
| parent | b75354ebe8278c27c1c5e42897457c6e102fba0e (diff) | |
| download | wireshark-c0663d9df5cecf680b6bb9c970faf7bfa9f2448a.tar.gz | |
- Include config.h
- Merge two ifdef _WIN32 sections
svn path=/trunk/; revision=53775
Diffstat (limited to 'ui/text_import_scanner.l')
| -rw-r--r-- | ui/text_import_scanner.l | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ui/text_import_scanner.l b/ui/text_import_scanner.l index bd59c749d6..1bcb4063fe 100644 --- a/ui/text_import_scanner.l +++ b/ui/text_import_scanner.l @@ -48,6 +48,8 @@ * *******************************************************************************/ +#include "config.h" + #include <stdio.h> #include <stdlib.h> @@ -58,13 +60,11 @@ * Flex (v 2.5.35) uses this symbol to "exclude" unistd.h */ #ifdef _WIN32 -#define YY_NO_UNISTD_H -#endif +# define YY_NO_UNISTD_H -#ifdef _WIN32 -/* disable Windows VC compiler warning "signed/unsigned mismatch" associated */ -/* with YY_INPUT code generated by flex versions such as 2.5.35. */ -#pragma warning (disable:4018) + /* disable Windows VC compiler warning "signed/unsigned mismatch" associated */ + /* with YY_INPUT code generated by flex versions such as 2.5.35. */ +# pragma warning (disable:4018) #endif %} |