tinyfugue: fix build

This commit is contained in:
Sizhe Zhao
2025-05-29 01:34:23 +08:00
parent e1e2f77161
commit 0171f786f5
3 changed files with 47 additions and 28 deletions
@@ -1,27 +0,0 @@
diff --git a/src/malloc.h b/src/malloc.h
index cc4d3bf..bbf78cd 100644
--- a/src/malloc.h
+++ b/src/malloc.h
@@ -34,6 +34,10 @@ extern int low_memory_warning;
# define realloc(ptr, size) mrealloc(NULL, ptr, size)
# define free(ptr) mfree(NULL, ptr)
#else
+#ifdef __APPLE__
+ #include <stdlib.h>
+ #include <sys/types.h>
+#endif
# define mmalloc(md, size) malloc(size)
# define mcalloc(md, size) calloc(size)
# define mrealloc(md, ptr, size) realloc(ptr, size)
diff --git a/src/tfio.c b/src/tfio.c
index 2cd2103..8640f2b 100644
--- a/src/tfio.c
+++ b/src/tfio.c
@@ -70,6 +70,7 @@ static void fileputs(const char *str, FILE *fp);
static void filenputs(const char *str, int n, FILE *fp);
static void queueputline(conString *line, TFILE *file);
+extern void main_loop(void);
void init_tfio(void)
{
+46
View File
@@ -0,0 +1,46 @@
diff -ur a/src/malloc.c b/src/malloc.c
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -12,7 +12,6 @@
#include "signals.h"
#include "malloc.h"
-caddr_t mmalloc_base = NULL;
int low_memory_warning = 0;
static char *reserve = NULL;
diff -ur a/src/malloc.h b/src/malloc.h
--- a/src/malloc.h
+++ b/src/malloc.h
@@ -34,6 +34,8 @@
# define realloc(ptr, size) mrealloc(NULL, ptr, size)
# define free(ptr) mfree(NULL, ptr)
#else
+# include <stdlib.h>
+# include <sys/types.h>
# define mmalloc(md, size) malloc(size)
# define mcalloc(md, size) calloc(size)
# define mrealloc(md, ptr, size) realloc(ptr, size)
diff -ur a/src/socket.c b/src/socket.c
--- a/src/socket.c
+++ b/src/socket.c
@@ -2600,7 +2600,7 @@
socks_with_lines--;
if (line->attrs & (F_TFPROMPT)) {
- incoming_text = line;
+ incoming_text = (String*)line;
handle_prompt(incoming_text, 0, TRUE);
continue;
}
diff -ur a/src/tfio.c b/src/tfio.c
--- a/src/tfio.c
+++ b/src/tfio.c
@@ -70,6 +70,7 @@
static void filenputs(const char *str, int n, FILE *fp);
static void queueputline(conString *line, TFILE *file);
+extern void main_loop(void);
void init_tfio(void)
{
+1 -1
View File
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
};
patches = [
./001-darwin-fixes.patch
./fix-build.patch
];
configureFlags = optional (!sslSupport) "--disable-ssl";