<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6ccac738a21a049cb336f685e9b383d5f2eaf08a">https://github.com/macports/macports-ports/commit/6ccac738a21a049cb336f685e9b383d5f2eaf08a</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 6ccac738a21 aalib: Adjust malloc.patch
</span>6ccac738a21 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6ccac738a21a049cb336f685e9b383d5f2eaf08a
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Sep 22 02:48:15 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> aalib: Adjust malloc.patch
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> No need to include stdlib.h twice.
</span>---
graphics/aalib/files/malloc.patch | 77 ++++++++++++++++-----------------------
1 file changed, 31 insertions(+), 46 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/aalib/files/malloc.patch b/graphics/aalib/files/malloc.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index e8328f3d69c..f50a5e0b86d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/aalib/files/malloc.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/aalib/files/malloc.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naurp src/aados.c src/aados.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/aados.c 2001-04-26 07:37:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/aados.c 2015-06-12 00:02:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Include the standard stdlib.h instead of the nonstandard malloc.h which
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+does not exist on macOS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/aados.c.orig 2001-04-26 09:37:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/aados.c 2020-09-22 02:41:31.000000000 -0500
</span> @@ -5,7 +5,7 @@
#include <go32.h>
#include <dpmi.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,21 +11,18 @@ diff -Naurp src/aados.c src/aados.c
</span> #include "aalib.h"
#include "aaint.h"
int __use_nearptr_hack;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naurp src/aadoskbd.c src/aadoskbd.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/aadoskbd.c 2001-04-26 07:37:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/aadoskbd.c 2015-06-12 00:02:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,7 +4,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/aadoskbd.c.orig 2001-04-26 09:37:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/aadoskbd.c 2020-09-22 02:42:30.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,7 +4,6 @@
</span> #include <go32.h>
#include <dpmi.h>
#include <sys/nearptr.h>
-#include <malloc.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span> #include <stdlib.h>
#include <dos.h>
#include <dpmi.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naurp src/aaedit.c src/aaedit.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/aaedit.c 2001-04-26 07:37:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/aaedit.c 2015-06-12 00:02:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/aaedit.c.orig 2001-04-26 09:37:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/aaedit.c 2020-09-22 02:41:31.000000000 -0500
</span> @@ -1,6 +1,6 @@
#include <string.h>
#include <ctype.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,18 +31,16 @@ diff -Naurp src/aaedit.c src/aaedit.c
</span> #include "aalib.h"
#include "aaint.h"
static void aa_editdisplay(struct aa_edit *e)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naurp src/aakbdreg.c src/aakbdreg.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/aakbdreg.c 2001-04-26 07:37:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/aakbdreg.c 2015-06-12 00:02:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/aakbdreg.c.orig 2001-04-26 09:37:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/aakbdreg.c 2020-09-22 02:41:31.000000000 -0500
</span> @@ -1,4 +1,4 @@
-#include <malloc.h>
+#include <stdlib.h>
#include "config.h"
#include "aalib.h"
#include "aaint.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naurp src/aalib.c src/aalib.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/aalib.c 2001-04-26 07:37:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/aalib.c 2015-06-12 00:02:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/aalib.c.orig 2001-04-26 09:37:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/aalib.c 2020-09-22 02:41:31.000000000 -0500
</span> @@ -1,6 +1,6 @@
#include <stdio.h>
#include <string.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,30 +49,26 @@ diff -Naurp src/aalib.c src/aalib.c
</span> #include "aalib.h"
#include "aaint.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naurp src/aalinux.c src/aalinux.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/aalinux.c 2001-04-26 07:43:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/aalinux.c 2015-06-12 00:02:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/aalinux.c.orig 2001-04-26 09:43:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/aalinux.c 2020-09-22 02:42:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,7 +1,6 @@
</span> #include "config.h"
#ifdef LINUX_DRIVER
#include <sys/stat.h>
-#include <malloc.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span> #include <sys/ioctl.h>
#include <linux/kd.h>
#ifdef GPM_MOUSEDRIVER
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naurp src/aamoureg.c src/aamoureg.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/aamoureg.c 2001-04-26 07:37:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/aamoureg.c 2015-06-12 00:02:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/aamoureg.c.orig 2001-04-26 09:37:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/aamoureg.c 2020-09-22 02:41:31.000000000 -0500
</span> @@ -1,4 +1,4 @@
-#include <malloc.h>
+#include <stdlib.h>
#include "config.h"
#include "aalib.h"
#include "aaint.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naurp src/aarec.c src/aarec.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/aarec.c 2001-04-26 07:37:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/aarec.c 2015-06-12 00:02:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/aarec.c.orig 2001-04-26 09:37:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/aarec.c 2020-09-22 02:41:31.000000000 -0500
</span> @@ -1,5 +1,5 @@
#include <string.h>
-#include <malloc.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,39 +76,32 @@ diff -Naurp src/aarec.c src/aarec.c
</span> #include "aalib.h"
#include "aaint.h"
aa_linkedlist *aa_kbdrecommended = NULL, *aa_mouserecommended = NULL,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naurp src/aaregist.c src/aaregist.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/aaregist.c 2001-04-26 07:37:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/aaregist.c 2015-06-12 00:02:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/aaregist.c.orig 2001-04-26 09:37:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/aaregist.c 2020-09-22 02:41:31.000000000 -0500
</span> @@ -1,4 +1,4 @@
-#include <malloc.h>
+#include <stdlib.h>
#include "config.h"
#include "aalib.h"
#include "aaint.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naurp src/aax.c src/aax.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/aax.c 2001-04-26 07:37:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/aax.c 2015-06-12 00:02:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/aax.c.orig 2001-04-26 09:37:54.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/aax.c 2020-09-22 02:42:17.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,3 @@
</span> -#include <malloc.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span> #include <stdlib.h>
#include <string.h>
#include <stdio.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naurp src/aaxkbd.c src/aaxkbd.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/aaxkbd.c 2001-04-26 07:37:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/aaxkbd.c 2015-06-12 00:02:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/aaxkbd.c.orig 2001-04-26 09:37:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/aaxkbd.c 2020-09-22 02:42:27.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,3 @@
</span> -#include <malloc.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span> #include <stdlib.h>
#include <string.h>
#include <stdio.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naurp src/aaxmouse.c src/aaxmouse.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/aaxmouse.c 2001-04-26 07:37:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/aaxmouse.c 2015-06-12 00:02:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/aaxmouse.c.orig 2001-04-26 09:37:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/aaxmouse.c 2020-09-22 02:42:34.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,3 @@
</span> -#include <malloc.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span> #include <stdlib.h>
#include <string.h>
#include <stdio.h>
</pre><pre style='margin:0'>
</pre>