From 3ad653d83d064413051c48da6e4c40f4f979f870 Mon Sep 17 00:00:00 2001
From: rowanbeentje <rowan@beent.je>
Date: Fri, 4 Mar 2011 23:33:07 +0000
Subject: Fix compiler warnings related to flex and derived sources

---
 Source/SPEditorTokens.l | 3 +--
 Source/SPSQLTokenizer.l | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'Source')

diff --git a/Source/SPEditorTokens.l b/Source/SPEditorTokens.l
index 7b19804a..67491351 100644
--- a/Source/SPEditorTokens.l
+++ b/Source/SPEditorTokens.l
@@ -41,12 +41,11 @@
 size_t utf8strlen(const char * _s);
 size_t yyuoffset, yyuleng;
 
-#define YY_NO_UNPUT
-
 //keep track of the current utf-8 character (not byte) offset and token length
 #define YY_USER_ACTION { yyuoffset += yyuleng; yyuleng = utf8strlen(yytext); }
 %}
 %option noyywrap
+%option nounput
 %option case-insensitive
 
 s		[ \t\n\r]+
diff --git a/Source/SPSQLTokenizer.l b/Source/SPSQLTokenizer.l
index 61fb3b8a..1964c94d 100644
--- a/Source/SPSQLTokenizer.l
+++ b/Source/SPSQLTokenizer.l
@@ -29,8 +29,6 @@
 int utf8strlenfortoken(const char * _s);
 int yyuoffset, yyuleng;
 
-#define YY_NO_UNPUT
-
 //keep track of the current utf-8 character (not byte) offset and token length
 #define YY_USER_ACTION { yyuoffset += yyuleng; yyuleng = utf8strlenfortoken(yytext); }
 //ignore the output of unmatched characters
@@ -38,6 +36,7 @@ int yyuoffset, yyuleng;
 %}
 %option prefix="to"
 %option noyywrap
+%option nounput
 %option case-insensitive
 %option nostdinit
 
@@ -135,5 +134,5 @@ int utf8strlenfortoken(const char * _s)
 	}
 
 done:
-	return ((s - _s) - count);
+	return (int)((s - _s) - count);
 }
-- 
cgit v1.2.3