diff options
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/listing.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gas/listing.c b/gas/listing.c index 49d24f6..a4465e7 100644 --- a/gas/listing.c +++ b/gas/listing.c @@ -92,7 +92,11 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ */ #include "as.h" +<<<<<<< listing.c +#include <ansidecl.h> +======= +>>>>>>> 1.13 #include <obstack.h> #include "input-file.h" #include "targ-cpu.h" @@ -977,7 +981,7 @@ void DEFUN_VOID(listing_eject) { s_ignore(); } -void DEFUN(listing_psize) +void DEFUN_VOID(listing_psize) { s_ignore(); } |