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.

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

1. 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)

1. if _GNUC_ >= 2
2. define _func_ _FUNCTION_
3. else
4. define _func_ "<unknown>"
5. endif
   #elif defined(_MSC_VER)
6. if _MSC_VER < 1300
7. define _func_ "<unknown>"
8. else
9. define _func_ _FUNCTION_
10. endif
    #elif defined(_BORLANDC_)
11. define _func_ _FUNC_
    #else
12. define _func_ "<unknown>"
    #endif
    #endif /* _func_ */

Yes, I like this most.