diff options
| author | Jeff Muizelaar <jmuizelaar@mozilla.com> | 2009-02-19 15:45:11 -0500 |
|---|---|---|
| committer | Jeff Muizelaar <jmuizelaar@mozilla.com> | 2009-02-19 15:45:11 -0500 |
| commit | 78de0e045ec0c10708052ed48df228e786839ddb (patch) | |
| tree | 3713def7155c5b88a528bbf31a94fd4d58f1c833 /src/cairo-compiler-private.h | |
| parent | 126824f5e6279f56dab0c040394b6c326b848cf7 (diff) | |
| download | cairo-78de0e045ec0c10708052ed48df228e786839ddb.tar.gz | |
Revert "Add CAIRO_ENSURE_UNIQUE macro and use it in _cairo_error()"
This reverts commit 126824f5e6279f56dab0c040394b6c326b848cf7.
It turns out MSVC doesn't handle line continuation characters in __asm{}
blocks very well, so revert for now until I come up with something that
works.
Diffstat (limited to 'src/cairo-compiler-private.h')
| -rw-r--r-- | src/cairo-compiler-private.h | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/src/cairo-compiler-private.h b/src/cairo-compiler-private.h index 236246e66..bd7cccd9b 100644 --- a/src/cairo-compiler-private.h +++ b/src/cairo-compiler-private.h @@ -172,30 +172,6 @@ #define inline __inline #endif -#ifdef _MSC_VER -/* When compiling with /Gy and /OPT:ICF identical functions will be folded in together. - The CAIRO_ENSURE_UNIQUE macro ensures that a function is always unique and - will never be folded into another one. Something like this might eventually - be needed for GCC but it seems fine for now. */ -#define CAIRO_ENSURE_UNIQUE \ - do { \ - char func[] = __FUNCTION__; \ - char file[] = __FILE__; \ - __asm { \ - jmp __internal_skip_line_no; \ - _emit (__LINE__ & 0xff); \ - _emit ((__LINE__>>8) & 0xff); \ - _emit ((__LINE__>>16) & 0xff); \ - _emit ((__LINE__>>24) & 0xff); \ - lea eax, func; \ - lea eax, file; \ - __internal_skip_line_no: \ - }; \ - } while (0) -#else -#define CAIRO_ENSURE_UNIQUE do { } while (0) -#endif - #ifdef __STRICT_ANSI__ #undef inline #define inline __inline__ |