From: ceriel <none@none>
Date: Fri, 12 Nov 1993 15:16:08 +0000 (+0000)
Subject: Minor changes: gave double def of __ctype with gcc on solaris 2
X-Git-Tag: release-5-5~229
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=332b6cb337db31c59c2a3d52d81cc0e0025730aa;p=ack.git

Minor changes: gave double def of __ctype with gcc on solaris 2
---

diff --git a/util/cgg/bootgram.y b/util/cgg/bootgram.y
index 41aca0721..0565b4667 100644
--- a/util/cgg/bootgram.y
+++ b/util/cgg/bootgram.y
@@ -13,7 +13,6 @@ static char rcsid[]="$Header$";
 
 #include <stdio.h>
 #include <assert.h>
-#include <ctype.h>
 #include <em_spec.h>
 #include <em_flag.h>
 #include <em_reg.h>
diff --git a/util/cgg/booth.h b/util/cgg/booth.h
index 7c5d944fe..7d5c89aea 100644
--- a/util/cgg/booth.h
+++ b/util/cgg/booth.h
@@ -55,12 +55,6 @@ typedef char * string;
 
 extern char *myalloc();
 
-#if __STDC__
-#include <stdlib.h>
-#else
-extern char *malloc();
-#endif
-
 #include <cg_pattern.h>
 
 typedef struct list1str {
diff --git a/util/cgg/bootlex.l b/util/cgg/bootlex.l
index 4101c97d4..c702a6d4d 100644
--- a/util/cgg/bootlex.l
+++ b/util/cgg/bootlex.l
@@ -14,7 +14,6 @@ static char rcsid2[]="$Header$";
 
 #include <stdio.h>
 #include <assert.h>
-#include <ctype.h>
 #include <em_spec.h>
 #include <em_flag.h>
 #include <em_reg.h>
diff --git a/util/cgg/main.c b/util/cgg/main.c
index 9254df430..16d5b2561 100644
--- a/util/cgg/main.c
+++ b/util/cgg/main.c
@@ -8,6 +8,7 @@
 #include "booth.h"
 
 extern char *strncpy(), *strcpy();
+extern char *malloc();
 #ifndef __STDC__
 extern char *sprintf();
 #else