MonetDB: default - Merge with Jul2017 branch.

[Sjoerd Mullender]

Changeset: 1ddad70b1c7e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1ddad70b1c7e
Modified Files:
        clients/Tests/exports.stable.out
        common/utils/mutils.h
        gdk/gdk_select.c
        sql/backends/monet5/generator/Makefile.ag
        sql/backends/monet5/generator/generator.c
Branch: default
Log Message:

Merge with Jul2017 branch.


diffs (70 lines):

diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -454,6 +454,7 @@ char *msab_registerStop(void);
 char *msab_retreatScenario(const char *lang);
 char *msab_serialise(char **ret, const sabdb *db);
 char *msab_wildRetreat(void);
+float nextafterf(float x, float y);
 const oid oid_nil;
 DIR *opendir(const char *dirname);
 void print_trace(void);
diff --git a/common/utils/mutils.h b/common/utils/mutils.h
--- a/common/utils/mutils.h
+++ b/common/utils/mutils.h
@@ -42,6 +42,10 @@ mutils_export int closedir(DIR *dir);
 
 mutils_export char *dirname(char *path);
 
+#ifndef HAVE_NEXTAFTER
+mutils_export float nextafterf(float x, float y);
+#endif
+
 #endif
 
 #ifndef S_IWGRP
diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -14,7 +14,7 @@
 
 #ifndef HAVE_NEXTAFTERF
 #define nextafter      _nextafter
-float nextafterf(float x, float y);
+#include "mutils.h"            /* nextafterf */
 #endif
 
 /* auxiliary functions and structs for imprints */
diff --git a/sql/backends/monet5/generator/Makefile.ag 
b/sql/backends/monet5/generator/Makefile.ag
--- a/sql/backends/monet5/generator/Makefile.ag
+++ b/sql/backends/monet5/generator/Makefile.ag
@@ -16,6 +16,7 @@ INCLUDES = ../../../include \
                   ../../../../monetdb5/scheduler \
                   ../../../../common/options \
                   ../../../../common/stream \
+                  ../../../../common/utils \
                   ../../../../gdk
 
 lib__generator = {
@@ -23,8 +24,7 @@ lib__generator = {
        DIR = libdir/monetdb5
        SOURCES = generator.c  generator.h
        LIBS = ../../../../monetdb5/tools/libmonetdb5 \
-                  ../../../../gdk/libbat \
-                  ../../../../common/utils/libmutils
+                  ../../../../gdk/libbat
 }
 
 headers_mal = {
diff --git a/sql/backends/monet5/generator/generator.c 
b/sql/backends/monet5/generator/generator.c
--- a/sql/backends/monet5/generator/generator.c
+++ b/sql/backends/monet5/generator/generator.c
@@ -497,7 +497,7 @@ VLTgenerator_subselect(Client cntxt, Mal
 }
 #ifndef HAVE_NEXTAFTERF
 #define nextafter   _nextafter
-float nextafterf(float x, float y);
+#include "mutils.h"            /* nextafterf */
 #endif
 
 #define PREVVALUEbte(x) ((x) - 1)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list