From 20a88218367a696573c8c60ec057fb51a0fc9be0 Mon Sep 17 00:00:00 2001
From: Steve Chamberlain <sac@cygnus>
Date: Tue, 5 May 1992 00:52:18 +0000
Subject: [PATCH] lint

---
 gas/listing.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gas/listing.c b/gas/listing.c
index 49d24f65fc2..a4465e74ba2 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();
 }
-- 
2.30.2