Details
-
Bug
-
Status: Closed (View Workflow)
-
Major
-
Resolution: Fixed
-
5.5.30
-
None
-
None
-
NetBSD 6.1 (and 5.1 being checked)
Description
The attached file fixes some compile time errors with respect to NetBSD 6.1 (and 5.1). Also its recommended for GCC that the option -Wno-char-subscripts be used to silence annoying compiler warnings about using a char for an array subscript (GCC folks need a life).
Attachments
Issue Links
- relates to
-
MDEV-20339 FreeBSD VM builder
-
- Open
-
Activity
I might overlook something trivial, but how
#if (_STDC_VERSION_ < 199901L) && !defined(_func_)
as in my patch is the very same as
#if _STDC_VERSION_ < 199901L
- ifndef _func_
as in your patch? Could you please clarify?
Thanks,
Vladislav
You version falls through to the #else line 1453, whereas my version enters the #if _STDC_VERSION_ < 199901L section before applying #ifndef _func_.
Alternatively should work too:
#ifndef _func_
#if (_STDC_VERSION_ < 199901L)
- if _GNUC_ >= 2
- define _func_ _FUNCTION_
- else
- define _func_ "<unknown>"
- endif
#elif defined(_MSC_VER) - if _MSC_VER < 1300
- define _func_ "<unknown>"
- else
- define _func_ _FUNCTION_
- endif
#elif defined(_BORLANDC_) - define _func_ _FUNC_
#else - define _func_ "<unknown>"
#endif
#endif /* _func_ */
The _func_ patch doesn't appear to work (NetBSD 6.1, gcc 4.5.3), many of these warnings...
Scanning dependencies of target strings
[ 4%] Building C object strings/CMakeFiles/strings.dir/bchange.c.o
In file included from /usr/local/src/mariadb-5.5.30/strings/strings_def.h:20:0,
from /usr/local/src/mariadb-5.5.30/strings/bchange.c:39:
/usr/local/src/mariadb-5.5.30/include/my_global.h:1453:0: warning: "_func_" redefined
/usr/include/sys/cdefs.h:353:0: note: this is the location of the previous definition
[ 4%] Building C object strings/CMakeFiles/strings.dir/bmove_upp.c.o
In file included from /usr/local/src/mariadb-5.5.30/strings/strings_def.h:20:0,
from /usr/local/src/mariadb-5.5.30/strings/bmove_upp.c:38:
/usr/local/src/mariadb-5.5.30/include/my_global.h:1453:0: warning: "_func_" redefined
/usr/include/sys/cdefs.h:353:0: note: this is the location of the previous definition
[ 4%] Building C object strings/CMakeFiles/strings.dir/ctype-big5.c.o
In file included from /usr/local/src/mariadb-5.5.30/strings/strings_def.h:20:0,
from /usr/local/src/mariadb-5.5.30/strings/ctype-big5.c:30:
/usr/local/src/mariadb-5.5.30/include/my_global.h:1453:0: warning: "_func_" redefined
/usr/include/sys/cdefs.h:353:0: note: this is the location of the previous definition
[ 4%] Building C object strings/CMakeFiles/strings.dir/ctype-bin.c.o
In file included from /usr/local/src/mariadb-5.5.30/strings/strings_def.h:20:0,
from /usr/local/src/mariadb-5.5.30/strings/ctype-bin.c:22:
/usr/local/src/mariadb-5.5.30/include/my_global.h:1453:0: warning: "_func_" redefined
/usr/include/sys/cdefs.h:353:0: note: this is the location of the previous definition
My suggested fix was better.