Changeset: e7e0c408ad16 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e7e0c408ad16
Modified Files:
configure.ag
gdk/gdk_posix.c
gdk/gdk_posix.h
gdk/gdk_system.c
gdk/gdk_system.h
Branch: headless
Log Message:
Merged from default
diffs (truncated from 621 to 300 lines):
diff --git a/buildtools/Mx/Form.c b/buildtools/Mx/Form.c
--- a/buildtools/Mx/Form.c
+++ b/buildtools/Mx/Form.c
@@ -278,7 +278,6 @@
FormBlk(Def * d)
{
Tok *t;
- int i;
for (t = FstTok(d->d_blk); t; t = NxtTok(t)) {
switch (t->t_dir) {
@@ -292,7 +291,6 @@
PrModeStr(t->t_str, t->t_dir);
break;
case T_INDEX:
- i = t->t_ext - '0';
PrStr(t->t_str);
break;
case T_SGML:
diff --git a/buildtools/Mx/Mx.c b/buildtools/Mx/Mx.c
--- a/buildtools/Mx/Mx.c
+++ b/buildtools/Mx/Mx.c
@@ -70,9 +70,7 @@
}
int
-main(argc, argv)
-int argc;
-char **argv;
+main(int argc, char **argv)
{
int i, k;
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -618,6 +618,12 @@
dnl ... however, some things aren't solved, yet:
dnl (for the time being,) we need to disable some warnings (making
them remarks doesn't seem to work with -Werror):
X_CFLAGS="$X_CFLAGS -wd1418,1419,981,810,193,111,1357"
+ dnl ICC 11 warns about non-pointer conversion from "<type>" to
+ dnl "<smaller>" may lose significant bits, it does however, also for
+ dnl constants like short s = 1234, which is too much
+ case $icc_ver in
+ 11.*) X_CFLAGS="$X_CFLAGS,2259" ;;
+ esac
case $icc_ver in
8.[[1-9]]*) X_CFLAGS="$X_CFLAGS,1572" ;;
9.[[1-9]]*) X_CFLAGS="$X_CFLAGS,1572,1599" ;;
@@ -2399,7 +2405,7 @@
if test "x$have_geos" != xno; then
save_LIBS="$LIBS"
LIBS="$LIBS $GEOS_LIBS"
- AC_CHECK_LIB(geos_c, GEOSEnvelope, :, [AC_MSG_ERROR([-lgeos_c
not found]); have_geos=no])
+ AC_CHECK_LIB(geos_c, GEOSEnvelope, :, have_geos=no)
LIBS="$save_LIBS"
fi
if test "x$have_geos" != xno; then
diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c
--- a/gdk/gdk_posix.c
+++ b/gdk/gdk_posix.c
@@ -29,11 +29,11 @@
* the WIN32 native platform.
*/
-#include "monetdb_config.h"
-#include "gdk.h"
+#include "gdk.h" /* includes gdk_posix.h */
#include "mutils.h"
#include <stdio.h>
#include <unistd.h> /* sbrk on Solaris */
+#include <string.h> /* strncpy */
#if defined(__hpux)
extern char *sbrk(int);
diff --git a/gdk/gdk_posix.h b/gdk/gdk_posix.h
--- a/gdk/gdk_posix.h
+++ b/gdk/gdk_posix.h
@@ -20,6 +20,7 @@
#ifndef GDK_POSIX_H
#define GDK_POSIX_H
+#include "monetdb_config.h"
#include <sys/types.h>
#ifdef HAVE_MALLOC_H
diff --git a/gdk/gdk_system.h b/gdk/gdk_system.h
--- a/gdk/gdk_system.h
+++ b/gdk/gdk_system.h
@@ -20,6 +20,8 @@
#ifndef _GDK_SYSTEM_H_
#define _GDK_SYSTEM_H_
+#include "monetdb_config.h"
+
#ifdef NATIVE_WIN32
#ifndef LIBGDK
#define gdk_export extern __declspec(dllimport)
diff --git a/monetdb5/tools/Tests/mclient-t-s.MAL.py
b/monetdb5/tools/Tests/mclient-t-s.MAL.py
--- a/monetdb5/tools/Tests/mclient-t-s.MAL.py
+++ b/monetdb5/tools/Tests/mclient-t-s.MAL.py
@@ -1,5 +1,8 @@
import os, sys
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
def client(args):
clt = process.client('mal', args = args,
diff --git a/sql/benchmarks/tpch/LOCKED/Tests/load.SQL.py
b/sql/benchmarks/tpch/LOCKED/Tests/load.SQL.py
--- a/sql/benchmarks/tpch/LOCKED/Tests/load.SQL.py
+++ b/sql/benchmarks/tpch/LOCKED/Tests/load.SQL.py
@@ -1,5 +1,8 @@
import os, sys
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
TSTSRCBASE = os.environ['TSTSRCBASE']
TSTDIR = os.environ['TSTDIR']
diff --git a/sql/benchmarks/tpch/Tests/load.SQL.py
b/sql/benchmarks/tpch/Tests/load.SQL.py
--- a/sql/benchmarks/tpch/Tests/load.SQL.py
+++ b/sql/benchmarks/tpch/Tests/load.SQL.py
@@ -1,5 +1,8 @@
import os, sys
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
TSTSRCBASE = os.environ['TSTSRCBASE']
TSTDIR = os.environ['TSTDIR']
diff --git
a/sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.SQL.py
b/sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.SQL.py
--- a/sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.SQL.py
+++ b/sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.SQL.py
@@ -1,5 +1,8 @@
import os, sys
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
def client(cmd, infile = None):
if infile is not None:
diff --git a/sql/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.SQL.py
b/sql/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.SQL.py
--- a/sql/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.SQL.py
+++ b/sql/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.SQL.py
@@ -1,5 +1,8 @@
import os, sys
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
c = process.client('sql',
stdin = open(os.path.join(os.getenv('TSTSRCDIR'),
diff --git a/sql/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.py
b/sql/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.py
--- a/sql/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.py
+++ b/sql/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.py
@@ -1,6 +1,9 @@
import sys
import os
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
def client(input):
c = process.client('sql',
diff --git a/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.SQL.py
b/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.SQL.py
--- a/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.SQL.py
+++ b/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.SQL.py
@@ -1,5 +1,8 @@
import os, sys
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
c = process.client('sql',
stdin = open(os.path.join(os.getenv('TSTSRCDIR'),
diff --git a/sql/test/BugTracker-2009/Tests/lost_update.SF-2790020.py
b/sql/test/BugTracker-2009/Tests/lost_update.SF-2790020.py
--- a/sql/test/BugTracker-2009/Tests/lost_update.SF-2790020.py
+++ b/sql/test/BugTracker-2009/Tests/lost_update.SF-2790020.py
@@ -1,7 +1,10 @@
import sys
import os
import time
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
def server():
return process.server('sql',
diff --git
a/sql/test/BugTracker-2009/Tests/set_history_and_drop_table.SF-2607045.SQL.py
b/sql/test/BugTracker-2009/Tests/set_history_and_drop_table.SF-2607045.SQL.py
---
a/sql/test/BugTracker-2009/Tests/set_history_and_drop_table.SF-2607045.SQL.py
+++
b/sql/test/BugTracker-2009/Tests/set_history_and_drop_table.SF-2607045.SQL.py
@@ -1,5 +1,8 @@
import os, sys
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
d = os.getenv('TSTSRCDIR')
diff --git a/sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.py
b/sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.py
--- a/sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.py
+++ b/sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.py
@@ -1,4 +1,7 @@
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
import os
s = process.server(lang = 'sql', args = ['--readonly'],
diff --git
a/sql/test/BugTracker-2010/Tests/operation-successful.Bug-2589.SQL.py
b/sql/test/BugTracker-2010/Tests/operation-successful.Bug-2589.SQL.py
--- a/sql/test/BugTracker-2010/Tests/operation-successful.Bug-2589.SQL.py
+++ b/sql/test/BugTracker-2010/Tests/operation-successful.Bug-2589.SQL.py
@@ -1,5 +1,8 @@
import sys
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
c = process.client(lang = 'sql',
args = ['-fsql',
diff --git a/sql/test/BugTracker/Tests/auto_commit.SF-1724151.SQL.py
b/sql/test/BugTracker/Tests/auto_commit.SF-1724151.SQL.py
--- a/sql/test/BugTracker/Tests/auto_commit.SF-1724151.SQL.py
+++ b/sql/test/BugTracker/Tests/auto_commit.SF-1724151.SQL.py
@@ -1,5 +1,8 @@
import os, sys
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
c = process.client('sql',
args = [os.path.join(os.getenv('TSTSRCDIR'),
diff --git a/sql/test/BugTracker/Tests/connect_crash.SF-1436626.py
b/sql/test/BugTracker/Tests/connect_crash.SF-1436626.py
--- a/sql/test/BugTracker/Tests/connect_crash.SF-1436626.py
+++ b/sql/test/BugTracker/Tests/connect_crash.SF-1436626.py
@@ -1,5 +1,8 @@
import os, sys
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
srv = process.server('sql', stdin = process.PIPE, stdout = process.PIPE,
stderr = process.PIPE)
diff --git a/sql/test/BugTracker/Tests/local_temp_table.SF-1865953.SQL.py
b/sql/test/BugTracker/Tests/local_temp_table.SF-1865953.SQL.py
--- a/sql/test/BugTracker/Tests/local_temp_table.SF-1865953.SQL.py
+++ b/sql/test/BugTracker/Tests/local_temp_table.SF-1865953.SQL.py
@@ -1,5 +1,8 @@
import os, sys
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
def client(args):
clt = process.client('sql', args = args, log = True,
diff --git
a/sql/test/BugTracker/Tests/mapi_connect_errors_vanish.SF-1432134.SQL.py
b/sql/test/BugTracker/Tests/mapi_connect_errors_vanish.SF-1432134.SQL.py
--- a/sql/test/BugTracker/Tests/mapi_connect_errors_vanish.SF-1432134.SQL.py
+++ b/sql/test/BugTracker/Tests/mapi_connect_errors_vanish.SF-1432134.SQL.py
@@ -1,5 +1,8 @@
import sys
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
c = process.client('sql', user = 'invalid', passwd = 'invalid',
stdout = process.PIPE, stderr = process.PIPE)
diff --git
a/sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.py
b/sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.py
--- a/sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.py
+++ b/sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.py
@@ -1,5 +1,8 @@
import os, sys
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
