Update of /cvsroot/monetdb/MonetDB4/src/mapi
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1794/src/mapi
Modified Files:
Makefile.ag mapi.mx
Log Message:
propagated changes of Monday Oct 22 2007 - Wednesday Oct 24 2007
from the MonetDB_4-20 branch to the development trunk
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/src/mapi/Makefile.ag,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.ag 3 Oct 2007 13:55:16 -0000 1.5
+++ Makefile.ag 24 Oct 2007 07:59:11 -0000 1.6
@@ -14,9 +14,9 @@
# Portions created by CWI are Copyright (C) 1997-2007 CWI.
# All Rights Reserved.
-INCLUDES = $(MONETDB_INCS) -I.. -I../monet \
+INCLUDES = -I.. -I../monet \
-I../modules/plain -I../modules/plain/stream \
- $(OPENSSL_INCS)
+ $(MONETDB_INCS) $(OPENSSL_INCS)
MTSAFE
Index: mapi.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/src/mapi/mapi.mx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- mapi.mx 3 Oct 2007 13:55:16 -0000 1.16
+++ mapi.mx 24 Oct 2007 07:59:13 -0000 1.17
@@ -1403,13 +1403,15 @@
}
proc mapi_server() : void {
- fork(mapi_listen(
- get_mapi_port(),
- str(nil),
- 5,
- get_mapi_open()
- )
- );
+ if (monet_environment.find("gdk_embedded") = "no") {
+ fork(mapi_listen(
+ get_mapi_port(),
+ str(nil),
+ 5,
+ get_mapi_open()
+ )
+ );
+ }
}
mapi_server();
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
