diff options
| author | Bryce McKinlay <bryce@gcc.gnu.org> | 2000-04-19 03:29:16 +0100 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2000-04-19 03:29:16 +0100 |
| commit | 56293c2be23c974508d5e8e680467555c57d7320 (patch) | |
| tree | b994ff1648f56f954388f0f6acfe4414031cbe1b /boehm-gc/cord | |
| parent | 0eebf9e5c729a27fec1c7ee40eefd226eb2df6e3 (diff) | |
| download | gcc-56293c2be23c974508d5e8e680467555c57d7320.zip gcc-56293c2be23c974508d5e8e680467555c57d7320.tar.gz gcc-56293c2be23c974508d5e8e680467555c57d7320.tar.bz2 | |
This commit was generated by cvs2svn to compensate for changes in r33244,
which included commits to RCS files with non-trunk default branches.
From-SVN: r33245
Diffstat (limited to 'boehm-gc/cord')
| -rw-r--r-- | boehm-gc/cord/cordprnt.c | 2 | ||||
| -rw-r--r-- | boehm-gc/cord/gc.h | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/boehm-gc/cord/cordprnt.c b/boehm-gc/cord/cordprnt.c index 9c8cc87..8d57f04 100644 --- a/boehm-gc/cord/cordprnt.c +++ b/boehm-gc/cord/cordprnt.c @@ -233,7 +233,7 @@ int CORD_vsprintf(CORD * out, CORD format, va_list args) if (width == NONE && prec == NONE) { register char c; - c = va_arg(args, char); + c = va_arg(args, int); CORD_ec_append(result, c); goto done; } diff --git a/boehm-gc/cord/gc.h b/boehm-gc/cord/gc.h index cc74765..3ac0d44 100644 --- a/boehm-gc/cord/gc.h +++ b/boehm-gc/cord/gc.h @@ -1,7 +1,8 @@ /* * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers * Copyright (c) 1991-1995 by Xerox Corporation. All rights reserved. - * Copyright 1996 by Silicon Graphics. All rights reserved. + * Copyright 1996-1999 by Silicon Graphics. All rights reserved. + * Copyright 1999 by Hewlett-Packard Company. All rights reserved. * * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED * OR IMPLIED. ANY USE IS AT YOUR OWN RISK. @@ -352,11 +353,11 @@ GC_API GC_PTR GC_malloc_atomic_ignore_off_page GC_PROTO((size_t lb)); #ifdef GC_ADD_CALLER # define GC_EXTRAS GC_RETURN_ADDR, __FILE__, __LINE__ -# define GC_EXTRA_PARAMS GC_word ra, GC_CONST char * descr_string, - int descr_int +# define GC_EXTRA_PARAMS GC_word ra, GC_CONST char * s, + int i #else # define GC_EXTRAS __FILE__, __LINE__ -# define GC_EXTRA_PARAMS GC_CONST char * descr_string, int descr_int +# define GC_EXTRA_PARAMS GC_CONST char * s, int i #endif /* Debugging (annotated) allocation. GC_gcollect will check */ |