Updating for GCC 6

24 May 2016

      Hi all,

GCC 6.1 was relased late last month,  and it was failing to build latest
MonetDB,  with the below 3 errors:

stream.c:2116:24: error: logical ‘or’ of equal expressions
[-Werror=logical-op]

       (errno == EAGAIN || errno == EWOULDBLOCK) && /* it was!
*/

^~

stream.c:2142:24: error: logical ‘or’ of equal expressions
[-Werror=logical-op]

       (errno == EAGAIN || errno ==
EWOULDBLOCK)

^~

mal_module.c: In function ‘getHelp’:
mal_module.c:455:3: error: this ‘for’ clause does not guard...
[-Werror=misleading-indentation]
   for(s= m->subscope[j]; s; s= s->peer)
   ^~~
mal_module.c:513:4: note: ...this statement, but the latter is misleadingly
indented as if it is guarded by the ‘for’
    m= m->sibling;
    ^

The first two appear to be because EAGAIN, EWOULDBLOCK have the same value
on my machine (x86_64, Fedora 23 64bit).  I don't know in what situation
they would be different from each other,  so I'm removing the check for
EWOULDBLOCK and checking only for EAGAIN, as suggested by some on the
Internet.

The third error is due to bad indentation.  If we reduce indentation of
mal_module.c:513  by two levels,  that solves it.

It works for me with these changes,  could someone confirm my solution to
first two errors won't cause regressions,  of suggest alternative solutions?

Thanks,
Sahas

Sahasranaman M S

Sahasranaman M S

Sjoerd Mullender

Sahasranaman M S

Sjoerd Mullender

Sahasranaman M S

Sjoerd Mullender

tags

participants (2)