Update of /cvsroot/monetdb/pathfinder/runtime
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv16424/runtime
Modified Files:
Tag: XQuery_0-16
Makefile.ag pathfinder.mx
Log Message:
The usual cleanup to get things to compile on Windows after people
make changes:
- When you use functions from a library, the library *must* be linked
in;
- The symbol TEXT is defined in a Windows header file and so cannot be
redefined by our code (several times in the past I changed our
definition to PFTEXT, but that doesn't seem to stick...).
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/Makefile.ag,v
retrieving revision 1.65.2.2
retrieving revision 1.65.2.3
diff -u -d -r1.65.2.2 -r1.65.2.3
--- Makefile.ag 11 Feb 2007 21:28:45 -0000 1.65.2.2
+++ Makefile.ag 16 Feb 2007 09:20:07 -0000 1.65.2.3
@@ -111,7 +111,7 @@
LIBS = \
$(PF_LIBS) $(SOCKET_LIBS) ./lib_pf_support
./lib_pathfinder \
$(MONETDB_LIBS) -lbat -lstream $(MONETDB4_LIBS)
-lmonet -lpthread \
- $(MONETDB4_MODS) -l_streams -l_builtin -l_ascii_io
+ $(MONETDB4_MODS) -l_mapi -l_streams -l_builtin
-l_ascii_io
}
scripts_mil = {
Index: pathfinder.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/pathfinder.mx,v
retrieving revision 1.288.2.13
retrieving revision 1.288.2.14
diff -u -d -r1.288.2.13 -r1.288.2.14
--- pathfinder.mx 15 Feb 2007 01:46:12 -0000 1.288.2.13
+++ pathfinder.mx 16 Feb 2007 09:20:08 -0000 1.288.2.14
@@ -3345,6 +3345,9 @@
#define is_fake_project(b) (((b)->htype==TYPE_void) && (BATcount(b)==1) &&
((b)->hseqbase==oid_nil))
+#ifdef TEXT /* Windows defines a symbol TEXT */
+#undef TEXT
+#endif
@:ws(c_decl)@
@:ws_decl(c)@
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
