x

[deliverable/binutils-gdb.git] / gas / listing.c

diff --git a/gas/listing.c b/gas/listing.c
index a4465e74ba2f4e83e143598e560dba2035c36bde..ef88c0d553031053d740f3518c1920ec02bb0529 100644 (file)
--- 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