Changeset: f2e6d362c3f0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f2e6d362c3f0
Modified Files:
Branch: Oct2010
Log Message:
merge
diffs (131 lines):
diff -r f676f36086ea -r f2e6d362c3f0 MonetDB/configure.ag
--- a/MonetDB/configure.ag Fri Dec 03 21:44:33 2010 +0100
+++ b/MonetDB/configure.ag Fri Dec 03 21:45:26 2010 +0100
@@ -85,10 +85,10 @@
AM_MONETDB_LIBS()
# Checks for typedefs, structures, and compiler characteristics.
-AC_COMPILE_IFELSE(AC_LANG_SOURCE([int foo(int * restrict p) { return *p; }]),
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int foo(int * restrict p) { return *p;
}]])],
AC_DEFINE(HAVE_RESTRICT, 1,
[Define if the compiler supports the restrict keyword]),
- AC_COMPILE_IFELSE(AC_LANG_SOURCE([int foo(int * __restrict__ p) {
return *p; }]),
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int foo(int * __restrict__ p) {
return *p; }]])],
AC_DEFINE(HAVE___RESTRICT__, 1,
[Define if the compiler supports the __restrict__
keyword])))
diff -r f676f36086ea -r f2e6d362c3f0
MonetDB5/src/mal/Tests/parseErrors.stable.out
--- a/MonetDB5/src/mal/Tests/parseErrors.stable.out Fri Dec 03 21:44:33
2010 +0100
+++ b/MonetDB5/src/mal/Tests/parseErrors.stable.out Fri Dec 03 21:45:26
2010 +0100
@@ -14,8 +14,8 @@
#K := :=
!SyntaxException:parseError:K := :=
!SyntaxException:parseError: ^Type identifier expected
-
-
+!SyntaxException:parseError:K := :=
+!SyntaxException:parseError: ^';' expected
function user.main():void;
K;
io.print(1);
diff -r f676f36086ea -r f2e6d362c3f0 buildtools/conf/MonetDB.m4
--- a/buildtools/conf/MonetDB.m4 Fri Dec 03 21:44:33 2010 +0100
+++ b/buildtools/conf/MonetDB.m4 Fri Dec 03 21:45:26 2010 +0100
@@ -2221,10 +2221,10 @@
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $OPENSSL_INCS"
if test "x$have_openssl" != xno; then
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([#include <openssl/ssl.h>],[]), , [
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],[[]])],
, [
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -DOPENSSL_NO_KRB5"
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([#include
<openssl/ssl.h>],[]),
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include
<openssl/ssl.h>]],[[]])],
AC_DEFINE(OPENSSL_NO_KRB5, 1, [Define if OpenSSL should
not use Kerberos 5]),
[ why_no_openssl="OpenSSL library not usable"; if test
"x$have_openssl" != xauto; then AC_MSG_ERROR([$why_no_openssl]); fi;
have_openssl=no ])
CPPFLAGS="$save_CPPFLAGS"])
@@ -2419,7 +2419,7 @@
CPPFLAGS="$CPPFLAGS $Z_CFLAGS"
save_LIBS="$LIBS"
LIBS="$LIBS $Z_LIBS -lz"
- AC_LINK_IFELSE(AC_LANG_PROGRAM([#include <zlib.h>], [(void)
gzopen("","");]),
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <zlib.h>]], [[(void)
gzopen("","");]])],
Z_LIBS="$Z_LIBS -lz",
[ if test "x$have_z" != xauto; then AC_MSG_ERROR([z library not
found]); fi; have_z=no ])
LIBS="$save_LIBS"
@@ -2459,8 +2459,8 @@
CPPFLAGS="$CPPFLAGS $BZ_CFLAGS"
save_LIBS="$LIBS"
LIBS="$LIBS $BZ_LIBS -lbz2"
- AC_LINK_IFELSE(AC_LANG_PROGRAM([#include <stdio.h>
-#include <bzlib.h>], [(void)BZ2_bzopen("","");]),
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
+#include <bzlib.h>]], [[(void)BZ2_bzopen("","");]])],
BZ_LIBS="$BZ_LIBS -lbz2",
[ if test "x$have_bz2" != xauto; then AC_MSG_ERROR([bz2 library
not found]); fi; have_bz2=no ])
LIBS="$save_LIBS"
diff -r f676f36086ea -r f2e6d362c3f0 clients/configure.ag
--- a/clients/configure.ag Fri Dec 03 21:44:33 2010 +0100
+++ b/clients/configure.ag Fri Dec 03 21:45:26 2010 +0100
@@ -119,7 +119,7 @@
fi
if test "x$have_unixodbc" != xno; then
AC_MSG_CHECKING([checking whether SQLColAttribute uses SQLLEN * or
SQLPOINTER])
- AC_COMPILE_IFELSE(
+ AC_COMPILE_IFELSE([
AC_LANG_PROGRAM([[
#include <sql.h>
SQLRETURN SQL_API
@@ -132,7 +132,7 @@
(void) pnValueLength;
(void) pnValue;
return SQL_SUCCESS;}]],
- [[SQLColAttribute(0,0,0,0,0,0,0);]]),
+ [[SQLColAttribute(0,0,0,0,0,0,0);]])],
[lenp_or_pointer_t='SQLLEN *'],
[lenp_or_pointer_t=SQLPOINTER])
AC_MSG_RESULT([using "$lenp_or_pointer_t"])
diff -r f676f36086ea -r f2e6d362c3f0 clients/src/mapilib/Mapi.mx
--- a/clients/src/mapilib/Mapi.mx Fri Dec 03 21:44:33 2010 +0100
+++ b/clients/src/mapilib/Mapi.mx Fri Dec 03 21:45:26 2010 +0100
@@ -4039,14 +4039,14 @@
if (line == NULL)
return mid->error;
switch (*line) {
- case PROMPTBEG:
+ case PROMPTBEG: /* \001 */
mid->active = NULL;
hdl->active = NULL;
/* set needmore flag if line equals PROMPT2 up
to newline */
- copy = PROMPT2;
+ copy = PROMPT2; /* \001\002\n */
while (*line) {
- if (*line != *copy)
+ if (*line != *copy) /* must be EOF or PROMPT1
\001\001\n */
return mid->error;
line++;
copy++;
@@ -4064,9 +4064,10 @@
yet (duh!), or if we've already seen
normal output for the current one */
if (result == NULL ||
- result->cache.writer > 0 ||
- result->querytype == Q_TABLE ||
- result->querytype == Q_UPDATE) {
+ result->cache.writer > 0 ||
+ result->querytype == Q_TABLE ||
+ result->querytype == Q_UPDATE)
+ {
result = new_result(hdl);
hdl->active = result;
}
@@ -4091,7 +4092,7 @@
}
add_cache(result, strdup(line), !lookahead);
if (lookahead > 0 &&
- (result->querytype == -1/* unknown (not SQL) */ ||
+ (result->querytype == -1 /* unknown (not SQL) */ ||
result->querytype == Q_TABLE ||
result->querytype == Q_UPDATE))
return mid->error;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
