diff options
author | Bill Meier <wmeier@newsguy.com> | 2008-04-25 17:40:29 +0000 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2008-04-25 17:40:29 +0000 |
commit | 0d4b874b44dd082eaa61b5b403069d0e3cd38453 (patch) | |
tree | c78189b236a540b92d55b797c7ec1bf798db3f76 /plugins | |
parent | ff523807655f111ba5ae1f84a030ee8a147c3997 (diff) |
Bug 2493: Fix (Part 2):
To prevent Windows compiler errors when using flex 2.5.35.
Fixes "missing unistd.h" and yywrap "mismatched parameter" warnings
[Upcoming Part 3: ignore 'signed /unsigned mismatch' errors]
svn path=/trunk/; revision=25173
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/mate/mate_parser.l | 23 | ||||
-rw-r--r-- | plugins/wimaxasncp/wimaxasncp_dict.l | 16 |
2 files changed, 29 insertions, 10 deletions
diff --git a/plugins/mate/mate_parser.l b/plugins/mate/mate_parser.l index f3a190407b..c58210e574 100644 --- a/plugins/mate/mate_parser.l +++ b/plugins/mate/mate_parser.l @@ -1,9 +1,4 @@ /* - * We want to stop processing when we get to the end of the input. - */ -%option noyywrap - -/* * We don't use unput, so don't generate code for it. */ %option nounput @@ -73,6 +68,13 @@ #define MATE_PARSE(token_type) MateParser(pParser, (token_type), g_strdup(yytext), mc ); +/* + * Flex (v 2.5.35) uses this symbol to "exclude" unistd.h + */ +#ifdef _WIN32 +#define YY_NO_UNISTD_H +#endif + %} pdu_kw Pdu @@ -325,3 +327,14 @@ extern gboolean mate_load_config(const gchar* filename, mate_config* matecfg) { return state; } + +/* + * We want to stop processing when we get to the end of the input. + * (%option noyywrap is not used because if used then + * some flex versions (eg: 2.5.35) generate code which causes + * warnings by the Windows VC compiler). + */ + +int yywrap(void) { + return 1; +} diff --git a/plugins/wimaxasncp/wimaxasncp_dict.l b/plugins/wimaxasncp/wimaxasncp_dict.l index 6d8a4a3364..798946ffea 100644 --- a/plugins/wimaxasncp/wimaxasncp_dict.l +++ b/plugins/wimaxasncp/wimaxasncp_dict.l @@ -1,9 +1,4 @@ /* - * We want to stop processing when we get to the end of the input. - */ -%option noyywrap - -/* * We don't use unput, so don't generate code for it. */ %option nounput @@ -731,6 +726,17 @@ void wimaxasncp_dict_print(FILE *fh, wimaxasncp_dict_t *d) { } } +/* + * We want to stop processing when we get to the end of the input. + * (%option noyywrap is not used because if used then + * some flex versions (eg: 2.5.35) generate code which causes + * warnings by the Windows VC compiler). + */ + +int yywrap(void) { + return 1; +} + #ifdef TEST_WIMAXASNCP_DICT_STANDALONE int main(int argc, char **argv) { wimaxasncp_dict_t *d; |