summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Muizelaar <jmuizelaar@mozilla.com>2014-06-30 14:17:18 -0400
committerJeff Muizelaar <jmuizelaar@mozilla.com>2014-06-30 14:17:18 -0400
commit550385fb004e6064305518cf265adc03bd2d0c0b (patch)
tree1731197bd227dccb1e52d108374d3584f6f7df94
parentf574fec8d2d1f83525fd7e4dbb266b6e5091627d (diff)
downloadcairo-550385fb004e6064305518cf265adc03bd2d0c0b.tar.gz
Don't use __FUNCTION__ as a string literal
clang-cl doesn't support this and we don't gain much from using it.
-rw-r--r--src/cairo-compiler-private.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/cairo-compiler-private.h b/src/cairo-compiler-private.h
index f3e971ebb..3d9bd2b53 100644
--- a/src/cairo-compiler-private.h
+++ b/src/cairo-compiler-private.h
@@ -221,15 +221,13 @@
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: \
}; \