Update of /cvsroot/monetdb/sql/src/server
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15796/src/server
Modified Files:
sql_parser.mx
Log Message:
propagated changes of Tuesday Aug 04 2009
from the Aug2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/08/04 - sjoerd: src/server/sql_parser.mx,1.312.2.2
We must define YYMALLOC and YYFREE at least on Windows when using
bison 2.4.1 or else we get:
y.tab.c(896): error #1736: dllexport/dllimport conflict with "malloc" (declared
at line 601 of "C:\Program Files (x86)\Microsoft Visual Studio
9.0\VC\INCLUDE\stdlib.h"); dllimport/dllexport dropped
void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
^
y.tab.c(903): error #1736: dllexport/dllimport conflict with "free" (declared
at line 600 of "C:\Program Files (x86)\Microsoft Visual Studio
9.0\VC\INCLUDE\stdlib.h"); dllimport/dllexport dropped
void free (void *); /* INFRINGES ON USER NAME SPACE */
^
compilation aborted for sql_parser.tab.c (code 2)
And then we might as well define them to GDK{malloc,free}.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: sql_parser.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_parser.mx,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -d -r1.313 -r1.314
--- sql_parser.mx 4 Aug 2009 07:24:32 -0000 1.313
+++ sql_parser.mx 4 Aug 2009 14:06:08 -0000 1.314
@@ -237,6 +237,9 @@
#endif
#define yyerror(s) parse_error(YYLEX_PARAM, s)
+#define YYMALLOC malloc
+#define YYFREE free
+
#define FALSE 0
#define TRUE 1
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
