Changeset: d394028c00f8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d394028c00f8
Removed Files:
common/utils/math_private.h
common/utils/s_nextafterf.c
Modified Files:
NT/monetdb_config.h.in
clients/Tests/exports.stable.out
clients/mapiclient/ReadlineTools.c
clients/mapiclient/dotmonetdb.c
clients/mapiclient/dump.c
clients/mapiclient/eventparser.h
clients/mapiclient/mclient.c
clients/mapiclient/mnc.c
clients/mapiclient/msqldump.c
clients/mapiclient/stethoscope.c
clients/mapiclient/tachograph.c
clients/mapiclient/tomograph.c
clients/mapilib/mapi.c
clients/odbc/driver/ODBCConvert.c
clients/odbc/driver/ODBCGlobal.h
clients/odbc/driver/ODBCUtil.c
clients/odbc/driver/SQLConnect.c
clients/odbc/setup/drvcfg.c
clients/odbc/setup/drvcfg.h
clients/odbc/winsetup/install.c
clients/odbc/winsetup/setup.c
common/options/getopt.c
common/options/getopt1.c
common/options/monet_options.c
common/stream/stream.c
common/utils/Makefile.ag
common/utils/msabaoth.c
common/utils/mutils.c
common/utils/mutils.h
common/utils/muuid.c
common/utils/prompt.c
configure.ag
gdk/gdk.h
gdk/gdk_atoms.c
gdk/gdk_calc.c
gdk/gdk_calc_private.h
gdk/gdk_interprocess.c
gdk/gdk_posix.c
gdk/gdk_posix.h
gdk/gdk_select.c
gdk/gdk_storage.c
gdk/gdk_system.c
geom/monetdb5/geom.h
monetdb5/mal/mal_sabaoth.c
monetdb5/modules/atoms/mcurl.c
monetdb5/modules/atoms/mtime.c
monetdb5/modules/atoms/mtime.h
monetdb5/modules/atoms/streams.h
monetdb5/modules/kernel/batmmath.c
monetdb5/modules/kernel/mmath.c
monetdb5/modules/kernel/status.c
monetdb5/modules/mal/inspect.h
monetdb5/modules/mal/manual.h
monetdb5/modules/mal/mat.h
monetdb5/modules/mal/mdb.h
monetdb5/modules/mal/oltp.h
monetdb5/modules/mal/profiler.h
monetdb5/modules/mal/txtsim.h
monetdb5/modules/mal/wlc.h
sql/backends/monet5/UDF/capi/capi.c
sql/backends/monet5/UDF/pyapi/undef.h
sql/backends/monet5/generator/generator.c
sql/backends/monet5/prog.c
sql/backends/monet5/sql_cast.c
sql/backends/monet5/sql_fround.c
sql/backends/monet5/vaults/shp/shp.c
sql/benchmarks/xmark/unix.c
sql/common/sql_list.c
sql/server/rel_psm.h
sql/server/rel_schema.h
sql/server/rel_semantic.c
sql/server/rel_semantic.h
sql/server/rel_updates.h
sql/server/sql_datetime.c
sql/server/sql_mvc.h
sql/server/sql_parser.y
sql/server/sql_scan.c
sql/server/sql_scan.h
sql/server/sql_semantic.c
sql/server/sql_semantic.h
testing/Mdiff.c
testing/Mtimeout.c
testing/difflib.c
testing/helpers.c
testing/helpers.h
tools/merovingian/client/monetdb.c
tools/merovingian/daemon/argvcmds.c
tools/merovingian/daemon/client.c
tools/merovingian/daemon/connections.c
tools/merovingian/daemon/connections.h
tools/merovingian/daemon/controlrunner.c
tools/merovingian/daemon/discoveryrunner.c
tools/merovingian/daemon/forkmserver.c
tools/merovingian/daemon/handlers.c
tools/merovingian/daemon/merovingian.c
tools/merovingian/daemon/merovingian.h
tools/merovingian/daemon/multiplex-funnel.c
tools/merovingian/daemon/multiplex-funnel.h
tools/merovingian/daemon/proxy.c
tools/merovingian/utils/control.c
tools/merovingian/utils/database.c
tools/merovingian/utils/glob.c
tools/merovingian/utils/properties.c
tools/merovingian/utils/utils.c
tools/merovingian/utils/utils.h
tools/mserver/monet_version.c.in
tools/mserver/mserver5.c
tools/mserver/shutdowntest.c
Branch: default
Log Message:
We require C99, so we don't need to check for stuff in the standard.
diffs (truncated from 3221 to 300 lines):
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -17,8 +17,15 @@
* _MSC_VER = 1600: Visual Studio 10.0
* _MSC_VER = 1800: Visual Studio 12.0
* _MSC_VER = 1900: Visual Studio 14.0
+ *
+ * versions below Visual Studio 12.0 are not supported: they lack
+ * required C-99 functionality.
*/
+#if defined(_MSC_VER) && _MSC_VER < 1800
+#error old versions of Visual Studio are no longer supported
+#endif
+
#ifndef _SEEN_MONETDB_CONFIG_H
#define _SEEN_MONETDB_CONFIG_H 1
@@ -36,51 +43,27 @@
#include <stdlib.h>
#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
/* In this case, malloc and friends are redefined in crtdbg.h to debug
- versions. We need to include stdlib.h and malloc.h first or else
- we get conflicting declarations.
-*/
+ * versions. We need to include stdlib.h first or else we get
+ * conflicting declarations. */
#include <crtdbg.h>
#endif
+/* standard C-99 include files */
+#include <assert.h>
+#include <errno.h>
+#include <inttypes.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdio.h>
+
+/* Windows include files */
#include <process.h>
#include <windows.h>
-#include <stddef.h>
#include <ws2tcpip.h>
+/* and one more include */
#include <sys/types.h>
-#include <stdio.h> /* NULL, printf etc. */
-#include <errno.h>
-#include <stdarg.h> /* va_alist.. */
-#if !defined(_MSC_VER) || _MSC_VER >= 1800
-#include <inttypes.h>
-#include <stdbool.h>
-#else
-#error old versions of Visual Studio are no longer supported
-/* ... but this is how you might be able to do it (untested) */
-#if !defined(_MSC_VER) || _MSC_VER >= 1600
-/* old Visual Studio */
-#include <stdint.h>
-#else
-/* ancient Visual Studio */
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-typedef unsigned __int64 uint64_t;
-typedef int64_t __int64;
-typedef uint64_t unsigned __int64;
-#endif
-/* normally defined in inttypes.h */
-#define PRId64 "I64d"
-#define PRIu64 "I64u"
-/* normally defined in stdbool.h */
-#define true 1
-#define false 0
-#define __bool_true_false_are_defined 1
-#endif
-
-#include <assert.h>
-
-#define __func__ __FUNCTION__
/* indicate to sqltypes.h that windows.h has already been included and
that it doesn't have to define Windows constants */
@@ -106,14 +89,6 @@ typedef uint64_t unsigned __int64;
/* architecture-dependent files */
#define EXEC_PREFIX PREFIX
-/* Define to 1 if you have the `asctime_r' function. */
-#define HAVE_ASCTIME_R 1
-
-/* Define if you have asctime_r(struct tm*,char *buf,size_t s) */
-#define HAVE_ASCTIME_R3 1
-/* there is something very similar to asctime_r on Windows: */
-#define asctime_r(t,b,s) asctime_s(b,s,t)
-
/* Define to nothing if C supports flexible array members, and to 1 if it does
not. That way, with a declaration like `struct s { int n; double
d[FLEXIBLE_ARRAY_MEMBER]; };', the struct hack can be used with pre-C99
@@ -123,46 +98,74 @@ typedef uint64_t unsigned __int64;
MSVC and with C++ compilers. */
#define FLEXIBLE_ARRAY_MEMBER
-#if !defined(_MSC_VER) || _MSC_VER >= 1800
+/* Define to 1 if you have the `asctime_r' function. */
+#define HAVE_ASCTIME_R 1
+
+/* Define if you have asctime_r(struct tm*,char *buf,size_t s) */
+#define HAVE_ASCTIME_R3 1
+/* there is something very similar to asctime_r on Windows: */
+#define asctime_r(t,b,s) asctime_s(b,s,t)
+
+/* Define to 1 if you have the <atomic_ops.h> header file. */
+/* #undef HAVE_ATOMIC_OPS_H */
+
+/* Define to 1 if you have the `backtrace' function. */
+/* #undef HAVE_BACKTRACE */
+
+/* Define to 1 if you have the <bam/bam.h> header file. */
+/* #undef HAVE_BAM_BAM_H */
+
+/* Define to 1 if you have the <bam/bgzf.h> header file. */
+/* #undef HAVE_BAM_BGZF_H */
+
+/* Define to 1 if you have the <bam/kstring.h> header file. */
+/* #undef HAVE_BAM_KSTRING_H */
+
+/* Define to 1 if you have the <bam/sam.h> header file. */
+/* #undef HAVE_BAM_SAM_H */
+
/* Define to 1 if you have the `cbrt' function. */
#define HAVE_CBRT 1
-#endif
+
+/* Define to 1 if you have the `clock_gettime' function. */
+/* #undef HAVE_CLOCK_GETTIME */
+
+/* Define if you have the CommonCrypto library */
+/* #undef HAVE_COMMONCRYPTO */
/* If the console should be used */
#define HAVE_CONSOLE 1
-/* crypt */
-/* #undef HAVE_CRYPT */
-
-/* Define to 1 if you have the <crypt.h> header file. */
-/* #undef HAVE_CRYPT_H */
-
/* Define to 1 if you have the `ctime_r' function. */
#define HAVE_CTIME_R 1
-#ifdef _MSC_VER
/* Define if you have ctime_r(time_t*,char *buf,size_t s) */
#define HAVE_CTIME_R3 1
/* there is something very similar to ctime_r on Windows: */
#define ctime_r(t,b,s) (ctime_s(b,s,t) ? NULL : (b))
-#endif
/* Define if you have the cURL library */
/* #undef HAVE_CURL */
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't.
*/
+/* #undef HAVE_DECL_TZNAME */
+
+/* Define to 1 if you have the <dirent.h> header file. */
/* #undef HAVE_DIRENT_H */
/* Define to 1 if you have the <dlfcn.h> header file. */
/* #undef HAVE_DLFCN_H */
+/* Support for MonetDB as a library */
+/* #undef HAVE_EMBEDDED */
+
+/* Support for MonetDB as a library for R */
+/* #undef HAVE_EMBEDDED_R */
+
/* Define to 1 if you have the <execinfo.h> header file. */
/* #undef HAVE_EXECINFO_H */
-/* Define to 1 if you have the `fabsf' function. */
-#define HAVE_FABSF 1
-
/* Define to 1 if you have the `fallocate' function. */
/* #undef HAVE_FALLOCATE */
@@ -175,14 +178,12 @@ typedef uint64_t unsigned __int64;
/* If the system has a working fdatasync */
/* #undef HAVE_FDATASYNC */
-/* Define to 1 if you have the <fenv.h> header file. */
-#if !defined(_MSC_VER) || _MSC_VER >= 1800
-#define HAVE_FENV_H 1
-#endif
-
/* Define if the fits module is to be enabled */
/* #undef HAVE_FITS */
+/* Define if fork exists */
+/* #undef HAVE_FORK */
+
/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
/* #undef HAVE_FSEEKO */
@@ -192,25 +193,16 @@ typedef uint64_t unsigned __int64;
/* Define to 1 if you have the `ftime' function. */
#define HAVE_FTIME 1
-/* Define to 1 if you have the `ftruncate' function. */
-#define HAVE_FTRUNCATE 1
-#ifdef _MSC_VER
#define ftruncate(fd, sz) (-(_chsize_s((fd), (__int64) (sz)) != 0))
-#endif
-/* Define if you use garbage collection */
-/* #undef HAVE_GC */
-
-/* Define to 1 if you have the <geos_c.h> header file. */
-/* #undef HAVE_GEOS_C_H */
+/* Define if you have the gdal library */
+/* #undef HAVE_GDAL */
/* Define to 1 if you have the `getaddrinfo' function. */
#define HAVE_GETADDRINFO 1
/* Define to 1 if you have the `GetDynamicTimeZoneInformation' function. */
-#ifdef _MSC_VER
#define HAVE_GETDYNAMICTIMEZONEINFORMATION 1
-#endif
/* Define to 1 if you have the `getexecname' function. */
/* #undef HAVE_GETEXECNAME */
@@ -241,9 +233,6 @@ typedef uint64_t unsigned __int64;
#define HAVE_ICONV_H 1
#endif
-/* Define to 1 if you have the <ieeefp.h> header file. */
-/* #undef HAVE_IEEEFP_H */
-
/* Define to 1 if you have the <io.h> header file. */
#define HAVE_IO_H 1
@@ -259,83 +248,55 @@ typedef uint64_t unsigned __int64;
/* Define if you have the bz2 library */
/* #undef HAVE_LIBBZ2 */
-/* Define if you have the cpc library */
-/* #undef HAVE_LIBCPC */
-
-/* Define to 1 if you have the <libcpc.h> header file. */
-/* #undef HAVE_LIBCPC_H */
-
/* Define to 1 if you have the <libgen.h> header file. */
/* #undef HAVE_LIBGEN_H */
/* Define to 1 if you have the <libintl.h> header file. */
/* #undef HAVE_LIBINTL_H */
-/* Define if you have the pcl library */
-/* #undef HAVE_LIBPCL */
+/* Define if you have the lz4 library */
+/* #undef HAVE_LIBLZ4 */
+
+/* Define if you have the lzma library */
+/* #undef HAVE_LIBLZMA */
/* Define if you have the pcre library */
/* #undef HAVE_LIBPCRE */
-/* Define if you have the perfctr library */
-/* #undef HAVE_LIBPERFCTR */
-
-/* Define to 1 if you have the <libperfctr.h> header file. */
-/* #undef HAVE_LIBPERFCTR_H */
-
-/* Define if you have the perfmon library */
-/* #undef HAVE_LIBPERFMON */
-
-/* Define if you have the pfm library */
-/* #undef HAVE_LIBPFM */
-
-/* Define if you have the pperf library */
-/* #undef HAVE_LIBPPERF */
-
-/* Define to 1 if you have the <libpperf.h> header file. */
-/* #undef HAVE_LIBPPERF_H */
-
/* Define if you have the pthread library */
/* #undef HAVE_LIBPTHREAD */
+/* Define if we can link to python */
+/* #undef HAVE_LIBPY */
+
+/* Define if we can link to python */
+/* #undef HAVE_LIBPY3 */
+
+/* Define if you have libR installed */
+/* #undef HAVE_LIBR */
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
