aboutsummaryrefslogtreecommitdiff
path: root/gas/listing.c
diff options
context:
space:
mode:
Diffstat (limited to 'gas/listing.c')
-rw-r--r--gas/listing.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/gas/listing.c b/gas/listing.c
index a4465e7..ef88c0d 100644
--- a/gas/listing.c
+++ b/gas/listing.c
@@ -92,11 +92,6 @@ 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"
@@ -343,6 +338,9 @@ DEFUN(buffer_line,(file, line, size),
return "";
}
+ if (file->linenum == 0)
+ rewind(file->file);
+
if (file->end_pending == 10) {
*p ++ = '\n';
fseek(file->file, 0,0 );
@@ -867,6 +865,8 @@ DEFUN_VOID(listing_eject)
void
DEFUN_VOID(listing_flags)
{
+ while ( (*input_line_pointer++) && (*input_line_pointer != '\n') )
+ input_line_pointer++;
}
void