diff options
| author |   Alan Modra <amodra@gmail.com> | 2012-06-07 12:47:23 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2012-06-07 12:47:23 +0000 |
| commit | 39a45edc073226e748566b497c216830cec119c4 (patch) | |
| tree | bd35d385584a6fcaca5e6a40a9933b33cafe1b2d /gas/macro.h | |
| parent | gold/ (diff) | |
| download | binutils-gdb-39a45edc073226e748566b497c216830cec119c4.tar.gz binutils-gdb-39a45edc073226e748566b497c216830cec119c4.tar.bz2 binutils-gdb-39a45edc073226e748566b497c216830cec119c4.zip | |
PR gas/14201
* sb.h (sb_max_power_two): Delete.
(struct sb): Delete "item" and "pot". Make "len" a size_t. Add "max".
(sb_element): Delete.
(sb_add_char, sb_add_buffer, sb_skip_comma, sb_skip_write): Update
prototypes.
* sb.c (string_count, free_list): Delete.
(sb_build, sb_kill, sb_check): Rewrite.
(scrub_from_sb, sb_add_char, sb_add_string, sb_add_buffer,
sb_skip_white, sb_skip_comma): Replace assorted int params,
vars and return types with size_t.
* input-scrub.c: Likewise.
* macro.c: Likewise.
* macro.h: Likewise.
* as.c: Likewise.
* as.h: Likewise.
* input-file.h: Likewise.
* input-file.c: Likewise.
* read.c: Likewise.
* app.c: ..or ptrdiff_t.
* input-file.c (input_file_get): Use ferror.
(input_file_give_next_buffer): Use input_file_get.
Diffstat (limited to 'gas/macro.h')
| -rw-r--r-- | gas/macro.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/gas/macro.h b/gas/macro.h index edc1b6bf2fe..b109178262e 100644 --- a/gas/macro.h +++ b/gas/macro.h @@ -1,6 +1,6 @@ /* macro.h - header file for macro support for gas Copyright 1994, 1995, 1996, 1997, 1998, 2000, 2002, 2003, 2004, 2005, 2006, - 2007 Free Software Foundation, Inc. + 2007, 2012 Free Software Foundation, Inc. Written by Steve and Judy Chamberlain of Cygnus Support, sac@cygnus.com @@ -82,15 +82,16 @@ extern int macro_nest; extern struct hash_control *macro_hash; -extern int buffer_and_nest (const char *, const char *, sb *, int (*) (sb *)); -extern void macro_init - (int, int, int, int (*) (const char *, int, sb *, int *)); +extern int buffer_and_nest (const char *, const char *, sb *, + size_t (*) (sb *)); +extern void macro_init (int, int, int, + size_t (*) (const char *, size_t, sb *, offsetT *)); extern void macro_set_alternate (int); extern void macro_mri_mode (int); -extern const char *define_macro - (int, sb *, sb *, int (*) (sb *), char *, unsigned int, const char **); +extern const char *define_macro (size_t, sb *, sb *, size_t (*) (sb *), + char *, unsigned int, const char **); extern int check_macro (const char *, sb *, const char **, macro_entry **); extern void delete_macro (const char *); -extern const char *expand_irp (int, int, sb *, sb *, int (*) (sb *)); +extern const char *expand_irp (int, size_t, sb *, sb *, size_t (*) (sb *)); #endif |