no dprintf() macro in libunwind to avoid collisions on some platforms

This commit is contained in:
Matthew Flatt 2013-07-23 19:55:23 -06:00
parent 245a688c2e
commit a31e9b29e0
2 changed files with 4 additions and 4 deletions

View File

@ -1774,7 +1774,7 @@ apply_reg_state (struct dwarf_cursor *c, struct dwarf_reg_state *rs)
if (c->ip == prev_ip && c->cfa == prev_cfa) if (c->ip == prev_ip && c->cfa == prev_cfa)
{ {
dprintf ("%s: ip and cfa unchanged; stopping here (ip=0x%lx)\n", Dprintf ("%s: ip and cfa unchanged; stopping here (ip=0x%lx)\n",
__FUNCTION__, (long) c->ip); __FUNCTION__, (long) c->ip);
return -UNW_EBADFRAME; return -UNW_EBADFRAME;
} }
@ -1839,7 +1839,7 @@ dwarf_find_save_locs (struct dwarf_cursor *c)
memcpy(rs, rs1, offsetof(struct dwarf_reg_state, ip)); memcpy(rs, rs1, offsetof(struct dwarf_reg_state, ip));
if (!rs) if (!rs)
{ {
dprintf ("%s: failed to create unwind rs\n", __FUNCTION__); Dprintf ("%s: failed to create unwind rs\n", __FUNCTION__);
ret = -UNW_EUNSPEC; ret = -UNW_EUNSPEC;
goto out; goto out;
} }

View File

@ -212,14 +212,14 @@ do { \
fprintf (stderr, format); \ fprintf (stderr, format); \
} \ } \
} while (0) } while (0)
# define dprintf(format...) fprintf (stderr, format) # define Dprintf(format...) fprintf (stderr, format)
# ifdef __GNUC__ # ifdef __GNUC__
# undef inline # undef inline
# define inline UNUSED # define inline UNUSED
# endif # endif
#else #else
# define Debug(level,format...) # define Debug(level,format...)
# define dprintf(format...) # define Dprintf(format...)
#endif #endif
static ALWAYS_INLINE int static ALWAYS_INLINE int