Changeset: 56a256a880fd for MonetDB
Modified Files:
Branch: Mar2018
Log Message:

Somehow lost a const; be explicit which part of the union is initialized.

diffs (40 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
@@ -366,7 +366,7 @@ BAT *VIEWcreate_(oid seq, BAT *b, int st
 size_t _MT_npages;
 size_t _MT_pagesize;
 const union _dbl_nil_t _dbl_nil_;
-union _flt_nil_t _flt_nil_;
+const union _flt_nil_t _flt_nil_;
 ssize_t batFromStr(const char *src, size_t *len, bat **dst);
 ssize_t batToStr(str *dst, size_t *len, const bat *src);
 ssize_t bitFromStr(const char *src, size_t *len, bit **dst);
diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c
--- a/gdk/gdk_atoms.c
+++ b/gdk/gdk_atoms.c
@@ -243,10 +243,10 @@ const int int_nil = GDK_int_min-1;
 /* Definition of NAN is seriously broken on Intel compiler (at least
  * in some versions), so we work around it. */
 const union _flt_nil_t _flt_nil_ = {
-       UINT32_C(0x7fc00000)
+       .l = UINT32_C(0x7FC00000)
 const union _dbl_nil_t _dbl_nil_ = {
-       UINT64_C(0x7ff8000000000000)
+       .l = UINT64_C(0x7FF8000000000000)
 const flt flt_nil = NAN;
diff --git a/gdk/gdk_atoms.h b/gdk/gdk_atoms.h
--- a/gdk/gdk_atoms.h
+++ b/gdk/gdk_atoms.h
@@ -113,7 +113,7 @@ union _flt_nil_t {
        uint32_t l;
        flt f;
-gdk_export union _flt_nil_t _flt_nil_;
+gdk_export const union _flt_nil_t _flt_nil_;
 #define flt_nil (_flt_nil_.f)
 union _dbl_nil_t {
        uint64_t l;
checkin-list mailing list

Reply via email to