diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-06-06 17:51:28 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-06-06 17:51:28 +0200 |
| commit | 4749d40c635634e25e07d28ce1a04e9263bcc375 (patch) | |
| tree | c5bb3287675cd8676d76c8ee42ef2d79cc599e25 /include/my_global.h | |
| parent | 1ff1cb10fc236010b5969058cab934c2b306c931 (diff) | |
| parent | 33ef993773449cb3917665b188f6b6575d399bd0 (diff) | |
| download | mariadb-git-4749d40c635634e25e07d28ce1a04e9263bcc375.tar.gz | |
5.5 merge
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h index 1b59e1b1a36..67dd08b4a43 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1423,6 +1423,7 @@ static inline char *dlerror(void) #endif /* Provide __func__ macro definition for platforms that miss it. */ +#if !defined (__func__) #if __STDC_VERSION__ < 199901L # if __GNUC__ >= 2 # define __func__ __FUNCTION__ @@ -1440,6 +1441,7 @@ static inline char *dlerror(void) #else # define __func__ "<unknown>" #endif +#endif /* !defined(__func__) */ #ifndef HAVE_RINT /** |