forked from osmocom/wireshark
Bug 2493: Fix (Part 3 of 3):
To prevent Windows compiler errors when using flex 2.5.35. Ignore 'signed /unsigned mismatch' warnings svn path=/trunk/; revision=25174
This commit is contained in:
parent
0d4b874b44
commit
2bce8b248c
|
@ -51,6 +51,12 @@
|
||||||
#include "dfunctions.h"
|
#include "dfunctions.h"
|
||||||
#include "scanner_lex.h"
|
#include "scanner_lex.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)
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* GLib 1.2[.x] doesn't define G_MAXINT32 or G_MININT32; if they're not
|
* GLib 1.2[.x] doesn't define G_MAXINT32 or G_MININT32; if they're not
|
||||||
* defined, we define them as the maximum and minimum 32-bit signed
|
* defined, we define them as the maximum and minimum 32-bit signed
|
||||||
|
|
|
@ -84,6 +84,12 @@ static const gchar* location(void);
|
||||||
#define YY_NO_UNISTD_H
|
#define YY_NO_UNISTD_H
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#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)
|
||||||
|
#endif
|
||||||
|
|
||||||
%}
|
%}
|
||||||
xmlpi_start "<?"
|
xmlpi_start "<?"
|
||||||
xmlpi_stop "?>"
|
xmlpi_stop "?>"
|
||||||
|
|
|
@ -61,6 +61,12 @@
|
||||||
#include "radius_dict_lex.h"
|
#include "radius_dict_lex.h"
|
||||||
#include <wiretap/file_util.h>
|
#include <wiretap/file_util.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)
|
||||||
|
#endif
|
||||||
|
|
||||||
#define ECHO
|
#define ECHO
|
||||||
#define MAX_INCLUDE_DEPTH 10
|
#define MAX_INCLUDE_DEPTH 10
|
||||||
|
|
||||||
|
|
|
@ -61,6 +61,12 @@
|
||||||
#include "uat_load_lex.h"
|
#include "uat_load_lex.h"
|
||||||
#include <wiretap/file_util.h>
|
#include <wiretap/file_util.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)
|
||||||
|
#endif
|
||||||
|
|
||||||
static uat_t* uat;
|
static uat_t* uat;
|
||||||
static guint colnum;
|
static guint colnum;
|
||||||
static gchar* ptr;
|
static gchar* ptr;
|
||||||
|
|
|
@ -47,7 +47,13 @@
|
||||||
#include "mate.h"
|
#include "mate.h"
|
||||||
#include "mate_grammar.h"
|
#include "mate_grammar.h"
|
||||||
#include "mate_parser_lex.h"
|
#include "mate_parser_lex.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)
|
||||||
|
#endif
|
||||||
|
|
||||||
void MateParser(void*,int, gchar*, mate_config* matecfg);
|
void MateParser(void*,int, gchar*, mate_config* matecfg);
|
||||||
#if (GLIB_MAJOR_VERSION > 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 16))
|
#if (GLIB_MAJOR_VERSION > 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 16))
|
||||||
void *MateParserAlloc(void *(*)(gsize));
|
void *MateParserAlloc(void *(*)(gsize));
|
||||||
|
|
|
@ -49,6 +49,12 @@
|
||||||
#define YY_NO_UNISTD_H
|
#define YY_NO_UNISTD_H
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#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)
|
||||||
|
#endif
|
||||||
|
|
||||||
%}
|
%}
|
||||||
|
|
||||||
hexdigit [0-9A-Fa-f]
|
hexdigit [0-9A-Fa-f]
|
||||||
|
|
Loading…
Reference in New Issue