Update of /cvsroot/monetdb/pathfinder/compiler/parser
In directory
sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19053/compiler/parser
Modified Files:
Tag: M5XQ
scanner.l
Log Message:
propagated changes of Wednesday Feb 03 2010
from the XQFT branch to the M5XQ branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2010/02/03 - sjoerd: compiler/parser/scanner.l,1.68.2.3
propagated changes of Wednesday Feb 03 2010
from the development trunk to the XQFT branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2010/02/03 - sjoerd: compiler/parser/scanner.l,1.72
propagated changes of Wednesday Feb 03 2010
from the Feb2010 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2010/02/03 - sjoerd: compiler/parser/scanner.l,1.71.2.1
Jump through hoops to get flex's use of isatty through the compiler on
Windows.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: scanner.l
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/parser/scanner.l,v
retrieving revision 1.66.4.4
retrieving revision 1.66.4.5
diff -u -d -r1.66.4.4 -r1.66.4.5
--- scanner.l 8 Jan 2010 09:06:40 -0000 1.66.4.4
+++ scanner.l 3 Feb 2010 11:44:28 -0000 1.66.4.5
@@ -81,8 +81,15 @@
#include "parser.tab.h"
#ifdef _MSC_VER
-/* avoid deprecation warning on Windows */
-#define isatty _isatty
+/* avoid deprecation warning and incompatible declaration complaints
+ * on Windows */
+#include <io.h>
+#define isatty my_isatty
+int
+my_isatty(int fd)
+{
+ return _isatty(fd);
+}
#endif
/* bison 1.33 does not include this line in XQuery.tab.h. So we do it here. */
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
