diff options
| author | Chase Douglas <chase.douglas@canonical.com> | 2012-04-16 09:47:42 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-07-02 22:34:32 -0700 |
| commit | 512bec06be6c79ca263da9de8f40430b8095b57b (patch) | |
| tree | 28559aeb0282094c1283478271cd3502e973cf18 /include | |
| parent | 0fa5217836cf7fd3872fccc9f3ff9ff32426c25b (diff) | |
Make BUG_WARN* signal safe
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/misc.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/misc.h b/include/misc.h index 6ae020a59..aa62f6a3a 100644 --- a/include/misc.h +++ b/include/misc.h @@ -371,10 +371,10 @@ extern _X_EXPORT unsigned long serverGeneration; /* Don't use this directly, use BUG_WARN or BUG_WARN_MSG instead */ #define __BUG_WARN_MSG(cond, with_msg, ...) \ do { if (cond) { \ - ErrorF("BUG: triggered 'if (" #cond ")'\n"); \ - ErrorF("BUG: %s:%d in %s()\n", \ - __FILE__, __LINE__, __func__); \ - if (with_msg) ErrorF(__VA_ARGS__); \ + ErrorFSigSafe("BUG: triggered 'if (" #cond ")'\n"); \ + ErrorFSigSafe("BUG: %s:%u in %s()\n", \ + __FILE__, __LINE__, __func__); \ + if (with_msg) ErrorFSigSafe(__VA_ARGS__); \ xorg_backtrace(); \ } } while(0) |