add missing includes to prevent segfaults

looks sane to ajacoutot@
This commit is contained in:
simon 2009-02-09 10:48:51 +00:00
parent e8be3e6c8d
commit 1c7cd32f95
12 changed files with 83 additions and 35 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.31 2009/01/09 17:43:38 naddy Exp $ # $OpenBSD: Makefile,v 1.32 2009/02/09 10:48:51 simon Exp $
COMMENT= ascii art library COMMENT= ascii art library
DISTNAME= aalib-1.4rc5 DISTNAME= aalib-1.4rc5
PKGNAME= aalib-1.4p0 PKGNAME= aalib-1.4p1
SHARED_LIBS= aa 2.0 SHARED_LIBS= aa 2.0
CATEGORIES= graphics CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aa-project/} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aa-project/}

View File

@ -1,10 +1,11 @@
$OpenBSD: patch-src_aaedit_c,v 1.1 2008/04/03 12:42:45 jasper Exp $ $OpenBSD: patch-src_aaedit_c,v 1.2 2009/02/09 10:48:51 simon Exp $
--- src/aaedit.c.orig Wed Apr 2 00:05:38 2008 --- src/aaedit.c.orig Thu Apr 26 16:37:31 2001
+++ src/aaedit.c Wed Apr 2 00:05:47 2008 +++ src/aaedit.c Mon Feb 9 00:48:47 2009
@@ -1,6 +1,5 @@ @@ -1,6 +1,6 @@
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
-#include <malloc.h> -#include <malloc.h>
+#include <stdlib.h>
#include "aalib.h" #include "aalib.h"
#include "aaint.h" #include "aaint.h"
static void aa_editdisplay(struct aa_edit *e) static void aa_editdisplay(struct aa_edit *e)

View File

@ -1,7 +1,13 @@
$OpenBSD: patch-src_aafire_c,v 1.1 2008/04/03 12:42:45 jasper Exp $ $OpenBSD: patch-src_aafire_c,v 1.2 2009/02/09 10:48:51 simon Exp $
--- src/aafire.c.orig Wed Apr 2 00:42:06 2008 --- src/aafire.c.orig Thu Apr 26 17:30:03 2001
+++ src/aafire.c Wed Apr 2 00:44:03 2008 +++ src/aafire.c Mon Feb 9 00:52:20 2009
@@ -48,6 +48,7 @@ static void @@ -1,4 +1,5 @@
#include <stdio.h>
+#include <stdlib.h>
#include "aalib.h"
#define XSIZ aa_imgwidth(context)
@@ -48,6 +49,7 @@ static void
initialize (void) initialize (void)
{ {
int i; int i;
@ -9,7 +15,7 @@ $OpenBSD: patch-src_aafire_c,v 1.1 2008/04/03 12:42:45 jasper Exp $
context = aa_autoinit (&aa_defparams); context = aa_autoinit (&aa_defparams);
if (context == NULL) if (context == NULL)
{ {
@@ -114,20 +115,20 @@ drawfire (void) @@ -114,20 +116,20 @@ drawfire (void)
height++; height++;
loop--; loop--;
if (loop < 0) if (loop < 0)

View File

@ -0,0 +1,9 @@
$OpenBSD: patch-src_aainfo_c,v 1.1 2009/02/09 10:48:51 simon Exp $
--- src/aainfo.c.orig Mon Feb 9 00:50:47 2009
+++ src/aainfo.c Mon Feb 9 00:51:05 2009
@@ -1,4 +1,5 @@
+#include <stdlib.h>
#include "aalib.h"
#include "aaint.h"
int main(int argc, char **argv)

View File

@ -1,8 +1,10 @@
$OpenBSD: patch-src_aakbdreg_c,v 1.1 2008/04/03 12:42:45 jasper Exp $ $OpenBSD: patch-src_aakbdreg_c,v 1.2 2009/02/09 10:48:51 simon Exp $
--- src/aakbdreg.c.orig Wed Apr 2 00:06:22 2008 --- src/aakbdreg.c.orig Thu Apr 26 16:37:31 2001
+++ src/aakbdreg.c Wed Apr 2 00:06:29 2008 +++ src/aakbdreg.c Mon Feb 9 00:49:46 2009
@@ -1,4 +1,3 @@ @@ -1,4 +1,5 @@
-#include <malloc.h> -#include <malloc.h>
+#include <stdlib.h>
+#include <string.h>
#include "config.h" #include "config.h"
#include "aalib.h" #include "aalib.h"
#include "aaint.h" #include "aaint.h"

View File

@ -1,10 +1,11 @@
$OpenBSD: patch-src_aalib_c,v 1.1 2008/04/03 12:42:45 jasper Exp $ $OpenBSD: patch-src_aalib_c,v 1.2 2009/02/09 10:48:51 simon Exp $
--- src/aalib.c.orig Wed Apr 2 00:06:52 2008 --- src/aalib.c.orig Thu Apr 26 16:37:31 2001
+++ src/aalib.c Wed Apr 2 00:06:57 2008 +++ src/aalib.c Mon Feb 9 00:48:39 2009
@@ -1,6 +1,5 @@ @@ -1,6 +1,6 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
-#include <malloc.h> -#include <malloc.h>
+#include <stdlib.h>
#include "aalib.h" #include "aalib.h"
#include "aaint.h" #include "aaint.h"

View File

@ -1,8 +1,10 @@
$OpenBSD: patch-src_aamoureg_c,v 1.1 2008/04/03 12:42:45 jasper Exp $ $OpenBSD: patch-src_aamoureg_c,v 1.2 2009/02/09 10:48:51 simon Exp $
--- src/aamoureg.c.orig Wed Apr 2 00:08:10 2008 --- src/aamoureg.c.orig Thu Apr 26 16:37:31 2001
+++ src/aamoureg.c Wed Apr 2 00:08:16 2008 +++ src/aamoureg.c Mon Feb 9 00:50:35 2009
@@ -1,4 +1,3 @@ @@ -1,4 +1,5 @@
-#include <malloc.h> -#include <malloc.h>
+#include <stdlib.h>
+#include <string.h>
#include "config.h" #include "config.h"
#include "aalib.h" #include "aalib.h"
#include "aaint.h" #include "aaint.h"

View File

@ -1,9 +1,10 @@
$OpenBSD: patch-src_aarec_c,v 1.1 2008/04/03 12:42:45 jasper Exp $ $OpenBSD: patch-src_aarec_c,v 1.2 2009/02/09 10:48:51 simon Exp $
--- src/aarec.c.orig Wed Apr 2 00:08:41 2008 --- src/aarec.c.orig Thu Apr 26 16:37:31 2001
+++ src/aarec.c Wed Apr 2 00:08:48 2008 +++ src/aarec.c Mon Feb 9 00:47:57 2009
@@ -1,5 +1,4 @@ @@ -1,5 +1,5 @@
#include <string.h> #include <string.h>
-#include <malloc.h> -#include <malloc.h>
+#include <stdlib.h>
#include "aalib.h" #include "aalib.h"
#include "aaint.h" #include "aaint.h"
aa_linkedlist *aa_kbdrecommended = NULL, *aa_mouserecommended = NULL, aa_linkedlist *aa_kbdrecommended = NULL, *aa_mouserecommended = NULL,

View File

@ -1,8 +1,10 @@
$OpenBSD: patch-src_aaregist_c,v 1.1 2008/04/03 12:42:45 jasper Exp $ $OpenBSD: patch-src_aaregist_c,v 1.2 2009/02/09 10:48:51 simon Exp $
--- src/aaregist.c.orig Wed Apr 2 00:09:10 2008 --- src/aaregist.c.orig Thu Apr 26 16:37:31 2001
+++ src/aaregist.c Wed Apr 2 00:09:18 2008 +++ src/aaregist.c Mon Feb 9 00:49:21 2009
@@ -1,4 +1,3 @@ @@ -1,4 +1,5 @@
-#include <malloc.h> -#include <malloc.h>
+#include <stdlib.h>
+#include <string.h>
#include "config.h" #include "config.h"
#include "aalib.h" #include "aalib.h"
#include "aaint.h" #include "aaint.h"

View File

@ -0,0 +1,8 @@
$OpenBSD: patch-src_aasavefont_c,v 1.1 2009/02/09 10:48:51 simon Exp $
--- src/aasavefont.c.orig Mon Feb 9 00:53:31 2009
+++ src/aasavefont.c Mon Feb 9 00:54:17 2009
@@ -1,3 +1,4 @@
+#include <stdlib.h>
#include "aalib.h"
int main(int argc, char **argv)
{

View File

@ -0,0 +1,9 @@
$OpenBSD: patch-src_aatest_c,v 1.1 2009/02/09 10:48:51 simon Exp $
--- src/aatest.c.orig Mon Feb 9 00:51:14 2009
+++ src/aatest.c Mon Feb 9 00:51:39 2009
@@ -1,3 +1,5 @@
+#include <stdlib.h>
+#include <string.h>
#include "aalib.h"
int main(int argc, char **argv)
{

View File

@ -1,8 +1,15 @@
$OpenBSD: patch-src_aaxkbd_c,v 1.1 2008/04/03 12:42:46 jasper Exp $ $OpenBSD: patch-src_aaxkbd_c,v 1.2 2009/02/09 10:48:51 simon Exp $
--- src/aaxkbd.c.orig Wed Apr 2 00:10:31 2008 --- src/aaxkbd.c.orig Thu Apr 26 16:37:31 2001
+++ src/aaxkbd.c Wed Apr 2 00:10:35 2008 +++ src/aaxkbd.c Mon Feb 9 00:47:34 2009
@@ -1,4 +1,3 @@ @@ -1,10 +1,10 @@
-#include <malloc.h> -#include <malloc.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include "config.h"
#ifdef X11_KBDDRIVER
#include <X11/Xlib.h>
+#include <X11/Xutil.h>
#include <X11/keysymdef.h>
#include <X11/keysym.h>
#include "aalib.h"