Changeset: 6aeb96301252 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6aeb96301252
Modified Files:
gdk/gdk.mx
gdk/gdk_bat.mx
Branch: default
Log Message:
Merged from Mar2011
diffs (110 lines):
diff --git a/clients/odbc/driver/ODBCGlobal.h b/clients/odbc/driver/ODBCGlobal.h
--- a/clients/odbc/driver/ODBCGlobal.h
+++ b/clients/odbc/driver/ODBCGlobal.h
@@ -92,7 +92,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <ctype.h>
-#include <assert.h>
#ifdef NATIVE_WIN32
# define strdup _strdup
diff --git a/common/stream/stream.h b/common/stream/stream.h
--- a/common/stream/stream.h
+++ b/common/stream/stream.h
@@ -35,7 +35,6 @@
#include <unistd.h>
#include <ctype.h>
-#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/gdk/gdk.mx b/gdk/gdk.mx
--- a/gdk/gdk.mx
+++ b/gdk/gdk.mx
@@ -1555,26 +1555,13 @@
return bi;
}
-#define BUNfirst(b) ((b)->batFirst)
-#ifdef NDEBUG
-#define BUNlast(b) ((b)->batFirst + (b)->batCount)
-#else
-static inline BUN
-BUNlast(BAT *b)
-{
- BUN last;
-
- assert(b->batFirst <= BUN_MAX);
- assert(b->batCount <= BUN_MAX);
- last = b->batFirst + b->batCount;
- assert(last <= BUN_MAX);
- return (BUN) last;
-}
-#endif
-
-#ifdef NDEBUG
+#define BUNfirst(b) (assert((b)->batFirst <= BUN_MAX), (b)->batFirst)
+#define BUNlast(b) (assert((b)->batFirst <= BUN_MAX), \
+ assert((b)->batCount <= BUN_MAX), \
+ assert((b)->batCount <= BUN_MAX - (b)->batFirst), \
+ (b)->batFirst + (b)->batCount)
+
#define BATcount(b) ((b)->batCount)
-#endif
/*
@
diff --git a/gdk/gdk_bat.mx b/gdk/gdk_bat.mx
--- a/gdk/gdk_bat.mx
+++ b/gdk/gdk_bat.mx
@@ -2220,16 +2220,6 @@
BUN list.
@{
@c
-#ifdef BATcount /* may be defined in gdh.mx */
-#undef BATcount
-#endif
-BUN
-BATcount(BAT *b)
-{
- BATcheck(b, "BATcount");
- return b->batCount;
-}
-
void
BATsetcapacity(BAT *b, BUN cnt)
{
diff --git a/sql/backends/monet5/vaults/Makefile.ag
b/sql/backends/monet5/vaults/Makefile.ag
--- a/sql/backends/monet5/vaults/Makefile.ag
+++ b/sql/backends/monet5/vaults/Makefile.ag
@@ -31,14 +31,14 @@
../../../../common/stream \
../../../../common/utils \
../../../../gdk \
- $(READLINE_INCS) $(MSEED_CFLAGS) $(cfitsio_CFLAGS)
+ $(READLINE_INCS) $(MSEED_CFLAGS) $(cfitsio_CFLAGS)
$(curl_CFLAGS)
lib__vault = {
MODULE
DIR = libdir/monetdb5
SOURCES = vault.mx
LIBS = ../../../../monetdb5/tools/libmonetdb5 \
- ../../../../gdk/libbat
+ ../../../../gdk/libbat $(curl_LIBS)
}
lib__mseed = {
diff --git a/sql/include/sql_mem.h b/sql/include/sql_mem.h
--- a/sql/include/sql_mem.h
+++ b/sql/include/sql_mem.h
@@ -21,8 +21,6 @@
#define _MEM_H_
#include <gdk.h>
-#include <stdio.h>
-#include <assert.h>
#define SQL_OK GDK_SUCCEED
#define SQL_ERR GDK_FAIL
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
