Bug 1032328. cairo: Don't use __FUNCTION__ as a string literal.

This was upstreamed as 550385fb004e6064305518cf265adc03bd2d0c0b
This commit is contained in:
Jeff Muizelaar 2014-06-30 14:26:03 -04:00
Родитель 4c8bf1a64e
Коммит 5169f5253e
1 изменённых файлов: 4 добавлений и 6 удалений

Просмотреть файл

@ -251,15 +251,13 @@ ffs (int x)
be needed for GCC but it seems fine for now. */
#define CAIRO_ENSURE_UNIQUE \
do { \
char func[] = __FUNCTION__; \
char file[] = __FILE__; \
__asm { \
__asm jmp __internal_skip_line_no \
__asm _emit (__LINE__ & 0xff) \
__asm _emit ((__LINE__>>8) & 0xff) \
__asm _emit ((__LINE__>>16) & 0xff) \
__asm _emit ((__LINE__>>24) & 0xff) \
__asm lea eax, func \
__asm _emit (__COUNTER__ & 0xff) \
__asm _emit ((__COUNTER__>>8) & 0xff) \
__asm _emit ((__COUNTER__>>16) & 0xff)\
__asm _emit ((__COUNTER__>>24) & 0xff)\
__asm lea eax, file \
__asm __internal_skip_line_no: \
}; \