Changeset: 059a27ca7a27 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=059a27ca7a27
Modified Files:
sql/backends/monet5/Makefile.ag
Branch: default
Log Message:
Merge with Dec2011 branch.
diffs (53 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
@@ -95,18 +95,20 @@
#ifdef SQLLEN /* it's a define for 32, a typedef for 64 */
#define LENFMT "%d"
#define ULENFMT "%u"
-#define LENCAST (int)
-#define ULENCAST (unsigned int)
+#define LENCAST (int)
+#define ULENCAST (unsigned int)
#else
#ifdef _MSC_VER
#define LENFMT "%I64d"
#define ULENFMT "%I64u"
+#define LENCAST (__int64)
+#define ULENCAST (unsigned __int64)
#else
#define LENFMT "%ld"
#define ULENFMT "%lu"
+#define LENCAST (long)
+#define ULENCAST (unsigned long)
#endif
-#define LENCAST (long)
-#define ULENCAST (unsigned long)
#endif
/* these functions are called from within the library */
diff --git a/clients/odbc/driver/SQLBindCol.c b/clients/odbc/driver/SQLBindCol.c
--- a/clients/odbc/driver/SQLBindCol.c
+++ b/clients/odbc/driver/SQLBindCol.c
@@ -52,8 +52,8 @@ SQLBindCol(SQLHSTMT StatementHandle,
ODBCDesc *desc; /* Application Row Descriptor */
#ifdef ODBCDEBUG
- ODBCLOG("SQLBindCol " PTRFMT " %d %s " LENFMT "\n",
- PTRFMTCAST StatementHandle, ColumnNumber,
+ ODBCLOG("SQLBindCol " PTRFMT " %u %s " LENFMT "\n",
+ PTRFMTCAST StatementHandle, (unsigned int) ColumnNumber,
translateCType(TargetType), LENCAST BufferLength);
#endif
diff --git a/sql/backends/monet5/Makefile.ag b/sql/backends/monet5/Makefile.ag
--- a/sql/backends/monet5/Makefile.ag
+++ b/sql/backends/monet5/Makefile.ag
@@ -18,7 +18,6 @@
SUBDIRS = NOT_WIN32?vaults UDF LSST ENABLE_DATACELL?datacell
INCLUDES = ../../include ../../common ../../storage ../../server \
- ../../../monetdb5/misc \
../../../monetdb5/modules/atoms \
../../../monetdb5/modules/kernel \
../../../monetdb5/mal \
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
