diff options
| author | Christian König <[email protected]> | 2011-03-04 17:15:43 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-03-04 17:15:43 +0100 |
| commit | 54f11a27a1ec28fcf9734f4454dee870bc0113f8 (patch) | |
| tree | 2dc71d95b1ad5d2ca966bbb6726fba45b4cfbac1 /src/gallium/include | |
| parent | 0eccb1038a620bc76ba45ac00c293b3e88427510 (diff) | |
| parent | 6838c9ce74f16c765474c0d2b4ae1469dd4a64d5 (diff) | |
Merge remote branch 'origin/master' into pipe-video
Diffstat (limited to 'src/gallium/include')
| -rw-r--r-- | src/gallium/include/pipe/p_compiler.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/gallium/include/pipe/p_compiler.h b/src/gallium/include/pipe/p_compiler.h index 3d6b5b5c81d..3441db685ce 100644 --- a/src/gallium/include/pipe/p_compiler.h +++ b/src/gallium/include/pipe/p_compiler.h @@ -171,6 +171,18 @@ typedef unsigned char boolean; # define __FUNCTION__ "<unknown>" # endif #endif +#ifndef __func__ +# if (__STDC_VERSION__ >= 199901L) || \ + (defined(__SUNPRO_C) && defined(__C99FEATURES__)) + /* __func__ is part of C99 */ +# elif defined(_MSC_VER) +# if _MSC_VER >= 1300 +# define __func__ __FUNCTION__ +# else +# define __func__ "<unknown>" +# endif +# endif +#endif |