[Kst] branches/work/kst/portto4-objectstore/kst/src/libkstmath

[George Staikos]

SVN commit 726767 by staikos:

windows build fixes.


 M  +1 -1      equation.cpp  
 M  +8 -0      escan.cpp  


--- branches/work/kst/portto4-objectstore/kst/src/libkstmath/equation.cpp #726766:726767
@@ -37,7 +37,7 @@
 #include "objectstore.h"
 
 /*extern "C"*/ int yyparse(Kst::ObjectStore *store);
-extern "C" void *ParsedEquation;
+extern void *ParsedEquation;
 /*extern "C"*/ struct yy_buffer_state *yy_scan_string(const char*);
 
 namespace Kst {
--- branches/work/kst/portto4-objectstore/kst/src/libkstmath/escan.cpp #726766:726767
@@ -503,8 +503,10 @@
  * down here because we want the user's section 1 to have been scanned first.
  * The user has a chance to override it with an option.
  */
+#ifndef Q_WS_WIN32
 #include <unistd.h>
 #endif
+#endif
 
 #ifndef YY_EXTRA_TYPE
 #define YY_EXTRA_TYPE void *
@@ -1484,7 +1486,9 @@
 }
 
 #ifndef __cplusplus
+#ifndef Q_WS_WIN32
 extern int isatty (int );
+#endif
 #endif /* __cplusplus */
     
 /* Initializes or reinitializes a buffer.
@@ -1510,7 +1514,11 @@
         b->yy_bs_column = 0;
     }
 
+#ifdef Q_WS_WIN32
+        b->yy_is_interactive = false;
+#else
         b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+#endif
     
 	errno = oerrno;
 }