Update of /cvsroot/monetdb/pathfinder/src/tools
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv15656/src/tools
Modified Files:
embeddedclient.mx
Log Message:
propagated changes of Thursday Mar 01 2007 - Friday Mar 02 2007
from the XQuery_0-16 branch to the development trunk
Index: embeddedclient.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/src/tools/embeddedclient.mx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- embeddedclient.mx 19 Jan 2007 14:41:41 -0000 1.11
+++ embeddedclient.mx 2 Mar 2007 12:35:44 -0000 1.12
@@ -38,7 +38,7 @@
#include "monet_options.h"
#ifdef WIN32
-#ifndef LIBEMBEDDEDCLIENT
+#ifndef LIBEMBEDDEDXQ
#define embeddedclient_export extern __declspec(dllimport)
#else
#define embeddedclient_export extern __declspec(dllexport)
@@ -56,9 +56,8 @@
@c
#include "pf_config.h"
#include "monet.h"
-#include "monet_options.h"
+#include "embeddedclient.h"
#include "initmodules.h"
-#include "Mapi.h"
#ifdef HAVE_PTHREAD_H
/* pthread.h on Windows includes config.h if HAVE_CONFIG_H is set */
@@ -170,7 +169,7 @@
snprintf(buf, sizeof(buf), "client(Stream(\"" PTRFMT "\"), Stream(\""
PTRFMT "\"));", PTRFMTCAST in, PTRFMTCAST out);
monet_exec("module(pathfinder);");
monet_exec("xquery_start_query_cache(16000000LL);");
- monet_exec("mapi_register(xquery_frontend());");
+/* monet_exec("mapi_register(xquery_frontend());"); */
monet_exec(buf);
return NULL;
}
-------------------------------------------------------------------------
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
