Fix compiler warnings on Windows (Visual Studio)

20 files changed, 53 insertions, 5 deletions

diff --git a/src/code.l b/src/code.l
index fb609e5..ee3876b 100644
--- a/src/code.l
+++ b/src/code.l
@@ -18,6 +18,9 @@
 %option prefix="codeYY"
 %option reentrant
 %option extra-type="struct codeYY_state *"
+%top{
+#include <stdint.h>
+}
 
 %{
 
diff --git a/src/configimpl.l b/src/configimpl.l
index 840213c..daa7d90 100644
--- a/src/configimpl.l
+++ b/src/configimpl.l
@@ -11,6 +11,9 @@
  */
 %option never-interactive
 %option prefix="configimplYY"
+%top{
+#include <stdint.h>
+}
 
 %{
 
diff --git a/src/constexp.l b/src/constexp.l
index eae8a3b..1c1678e 100644
--- a/src/constexp.l
+++ b/src/constexp.l
@@ -20,6 +20,9 @@
 %option nounput
 %option reentrant bison-bridge
 %option extra-type="struct constexpYY_state *"
+%top{
+#include <stdint.h>
+}
 
 %{
 
diff --git a/src/declinfo.l b/src/declinfo.l
index af94569..1660033 100644
--- a/src/declinfo.l
+++ b/src/declinfo.l
@@ -20,6 +20,9 @@
 %option noyywrap
 %option reentrant
 %option extra-type="struct declinfoYY_state *"
+%top{
+#include <stdint.h>
+}
 
 %{
 
diff --git a/src/defargs.l b/src/defargs.l
index e9dd60e..e6f74c1 100644
--- a/src/defargs.l
+++ b/src/defargs.l
@@ -43,6 +43,9 @@
 %option prefix="defargsYY"
 %option reentrant
 %option extra-type="struct defargsYY_state *"
+%top{
+#include <stdint.h>
+}
 
 %{
 
diff --git a/src/doctokenizer.l b/src/doctokenizer.l
index 11e96d6..4f03c9b 100644
--- a/src/doctokenizer.l
+++ b/src/doctokenizer.l
@@ -18,6 +18,9 @@
 
 %option never-interactive
 %option prefix="doctokenizerYY"
+%top{
+#include <stdint.h>
+}
 
 %{
 
diff --git a/src/dotrunner.cpp b/src/dotrunner.cpp
index fbfeaca..22a113a 100644
--- a/src/dotrunner.cpp
+++ b/src/dotrunner.cpp
@@ -114,7 +114,7 @@ static bool resetPDFSize(const int width,const int height, const char *base)
 bool DotRunner::readBoundingBox(const char *fileName,int *width,int *height,bool isEps)
 {
   const char *bb = isEps ? "%%PageBoundingBox:" : "/MediaBox [";
-  int bblen = strlen(bb);
+  int bblen = (int)strlen(bb);
   FILE *f = Portable::fopen(fileName,"rb");
   if (!f) 
   {
diff --git a/src/fortrancode.l b/src/fortrancode.l
index e686833..4d8dc1c 100644
--- a/src/fortrancode.l
+++ b/src/fortrancode.l
@@ -26,6 +26,9 @@
 %option never-interactive
 %option case-insensitive
 %option prefix="fortrancodeYY"
+%top{
+#include <stdint.h>
+}
 
 %{
 
diff --git a/src/fortranscanner.l b/src/fortranscanner.l
index ab90996..3a5123c 100644
--- a/src/fortranscanner.l
+++ b/src/fortranscanner.l
@@ -42,6 +42,9 @@
 %option prefix="fortranscannerYY"
 %option reentrant
 %option extra-type="struct fortranscannerYY_state *"
+%top{
+#include <stdint.h>
+}
 
 %{
 
diff --git a/src/growbuf.h b/src/growbuf.h
index bf6d74e..2d0d503 100644
--- a/src/growbuf.h
+++ b/src/growbuf.h
@@ -29,7 +29,7 @@ class GrowBuf
     void addStr(const char *s) {
                         if (s)
                         {
-                          int l=strlen(s);
+                          int l=(int)strlen(s);
                           if (pos+l>=len) { len+=l+GROW_AMOUNT; str = (char*)realloc(str,len); }
                           strcpy(&str[pos],s);
                           pos+=l;
@@ -38,7 +38,7 @@ class GrowBuf
     void addStr(const char *s,int n) {
                         if (s)
                         {
-                          int l=strlen(s);
+                          int l=(int)strlen(s);
                           if (n<l) l=n;
                           if (pos+l>=len) { len+=l+GROW_AMOUNT; str = (char*)realloc(str,len); }
                           strncpy(&str[pos],s,n);
diff --git a/src/message.cpp b/src/message.cpp
index d8f83ef..9a5eaca 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -259,7 +259,7 @@ void term(const char *fmt, ...)
   va_end(args);
   if (warnFile != stderr)
   {
-    for (int i = 0; i < strlen(error_str); i++) fprintf(warnFile, " ");
+    for (int i = 0; i < (int)strlen(error_str); i++) fprintf(warnFile, " ");
     fprintf(warnFile, "%s\n", "Exiting...");
   }
   exit(1);
diff --git a/src/pre.l b/src/pre.l
index 4fafe40..d6e6d14 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -18,6 +18,9 @@
 %option prefix="preYY"
 %option reentrant
 %option extra-type="struct preYY_state *"
+%top{
+#include <stdint.h>
+}
 
 %{
 
diff --git a/src/pycode.l b/src/pycode.l
index f7e255f..9dee2e8 100644
--- a/src/pycode.l
+++ b/src/pycode.l
@@ -23,6 +23,9 @@
 
 %option never-interactive
 %option prefix="pycodeYY"
+%top{
+#include <stdint.h>
+}
 
 %{
 
diff --git a/src/pyscanner.l b/src/pyscanner.l
index e5f4073..0abaae1 100644
--- a/src/pyscanner.l
+++ b/src/pyscanner.l
@@ -25,6 +25,9 @@
 %option prefix="pyscannerYY"
 %option reentrant
 %option extra-type="struct pyscannerYY_state *"
+%top{
+#include <stdint.h>
+}
 
 %{
 
diff --git a/src/scanner.l b/src/scanner.l
index 900933d..9ad061c 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -18,6 +18,9 @@
 %option prefix="scannerYY"
 %option reentrant
 %option extra-type="struct scannerYY_state *"
+%top{
+#include <stdint.h>
+}
 
 %{
 
diff --git a/src/sqlcode.l b/src/sqlcode.l
index 02c2c14..e73fe4c 100644
--- a/src/sqlcode.l
+++ b/src/sqlcode.l
@@ -19,6 +19,9 @@
 %option nounput
 %option reentrant
 %option extra-type="struct sqlcodeYY_state *"
+%top{
+#include <stdint.h>
+}
 
 %{
 
diff --git a/src/tclscanner.l b/src/tclscanner.l
index a92b23e..7f776ca 100644
--- a/src/tclscanner.l
+++ b/src/tclscanner.l
@@ -17,6 +17,9 @@
 %option never-interactive
 %option case-insensitive
 %option prefix="tclscannerYY"
+%top{
+#include <stdint.h>
+}
 
 %{
 #include <stdio.h> 
diff --git a/src/vhdlcode.l b/src/vhdlcode.l
index fe5a8d9..7350bfe 100644
--- a/src/vhdlcode.l
+++ b/src/vhdlcode.l
@@ -20,6 +20,9 @@
 %option never-interactive
 %option case-insensitive
 %option prefix="vhdlcodeYY"
+%top{
+#include <stdint.h>
+}
 
 %{
 
diff --git a/src/vhdljjparser.cpp b/src/vhdljjparser.cpp
index cf6e294..22e2e01 100644
--- a/src/vhdljjparser.cpp
+++ b/src/vhdljjparser.cpp
@@ -609,7 +609,7 @@ int VHDLOutlineParser::getLine()
 
 void VHDLOutlineParser::setLineParsed(int tok)
 {
-  if (p->lineParse.size()<=tok) p->lineParse.resize(tok+1);
+  if ((int)p->lineParse.size()<=tok) p->lineParse.resize(tok+1);
   p->lineParse[tok]=p->yyLineNr;
 }
 
diff --git a/src/xmlcode.l b/src/xmlcode.l
index 94548f8..edc98d5 100644
--- a/src/xmlcode.l
+++ b/src/xmlcode.l
@@ -19,6 +19,9 @@
 
 %option never-interactive
 %option prefix="xmlcodeYY"
+%top{
+#include <stdint.h>
+}
 
 %{