Update of /cvsroot/monetdb/MonetDB4/src/monet
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6910/src/monet
Modified Files:
monet.mx monet_tbl.mx
Log Message:
propagated changes of Monday Nov 05 2007 - Thursday Nov 08 2007
from the MonetDB_4-20 branch to the development trunk
Index: monet_tbl.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/src/monet/monet_tbl.mx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- monet_tbl.mx 4 Oct 2007 10:35:32 -0000 1.10
+++ monet_tbl.mx 8 Nov 2007 19:12:59 -0000 1.11
@@ -318,7 +318,7 @@
#endif
#endif /* _MONET_TBL_H */
@c
-#ifndef STATIC
+#ifndef MONETDB_STATIC
#ifdef HAVE_DLFCN_H
# ifdef __APPLE__
@@ -351,7 +351,7 @@
int DL_errno = 0;
-#ifndef STATIC
+#ifndef MONETDB_STATIC
static const char *DL_errmsg;
#endif
str DL_mod[DL_TABLE_MAXLIBS] = { 0 };
@@ -448,7 +448,7 @@
return locate_file(mod_name, MIL_EXT);
}
-#ifndef STATIC
+#ifndef MONETDB_STATIC
static char *
MSP_locate_module(const char *mod_name)
{
@@ -477,7 +477,7 @@
int i;
DL_errno = 0;
-#ifndef STATIC
+#ifndef MONETDB_STATIC
DL_errmsg = NULL;
/* AIX requires RTLD_MEMBER to load a module that is a member of an archive.
*/
@@ -491,7 +491,7 @@
}
if (tbl == NULL) {
-#ifndef STATIC
+#ifndef MONETDB_STATIC
char *fullname;
if ((fullname = MSP_locate_module(nme)) != NULL) {
@@ -521,7 +521,7 @@
int i;
DL_errno = 0;
-#ifndef STATIC
+#ifndef MONETDB_STATIC
if (tbl->dynamic_handle) {
return dlsym(tbl->dynamic_handle, nme);
}
@@ -541,7 +541,7 @@
{
int ret = 0;
-#ifndef STATIC
+#ifndef MONETDB_STATIC
dltable *tbl = (dltable *) handle;
int i;
@@ -571,7 +571,7 @@
static const char *
DL_error(void)
{
-#ifndef STATIC
+#ifndef MONETDB_STATIC
if (DL_errmsg != NULL)
return DL_errmsg;
if (DL_errno == 0)
@@ -1032,7 +1032,7 @@
BAT *b = BATnew(TYPE_int, TYPE_str, 100);
int i = 0;
-#ifdef STATIC
+#ifdef MONETDB_STATIC
for (i = 0; i < DL_TABLE_MAXLIBS; i++) {
if (DL_mod[i])
BUNins(b, &i, DL_mod[i] + 1, FALSE);
Index: monet.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/src/monet/monet.mx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- monet.mx 7 Sep 2007 21:11:05 -0000 1.7
+++ monet.mx 8 Nov 2007 19:12:59 -0000 1.8
@@ -391,7 +391,7 @@
void
monet_hello(stream *out)
{
-#ifdef STATIC
+#ifdef MONETDB_STATIC
char *linkinfo = "statically";
#else
char *linkinfo = "dynamically";
-------------------------------------------------------------------------
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
