[cairo-commit] src/cairo-compiler-private.h

[Jeff Muizelaar]

 src/cairo-compiler-private.h |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 550385fb004e6064305518cf265adc03bd2d0c0b
Author: Jeff Muizelaar <jmuizelaar at mozilla.com>
Date:   Mon Jun 30 14:17:18 2014 -0400

    Don't use __FUNCTION__ as a string literal
    
    clang-cl doesn't support this and we don't gain much
    from using it.

diff --git a/src/cairo-compiler-private.h b/src/cairo-compiler-private.h
index f3e971e..3d9bd2b 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:        \
 	};                                        \