diff options
author | Austin Foxley <austinf@cetoncorp.com> | 2009-12-23 12:14:26 -0800 |
---|---|---|
committer | Austin Foxley <austinf@cetoncorp.com> | 2009-12-23 12:14:35 -0800 |
commit | 784e157fadbf1622d381e7dc9e82d2510a690776 (patch) | |
tree | 9c607dcdb0bba66b7a64a6a2cfa55eefcd529feb | |
parent | 875d11eec5df38bae0003df4a884ef962cf28590 (diff) | |
parent | b2c9cb1927c5ed40c4bf2001abb0077bc5afb90b (diff) |
Merge remote branch 'origin/master' into nptl
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
-rw-r--r-- | ldso/ldso/dl-elf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c index a0db63750..6b64f3e04 100644 --- a/ldso/ldso/dl-elf.c +++ b/ldso/ldso/dl-elf.c @@ -894,7 +894,7 @@ void _dl_dprintf(int fd, const char *fmt, ...) #endif va_list args; char *start, *ptr, *string; - static char *buf; + char *buf; if (!fmt) return; |