mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-16 16:50:06 +02:00
162 lines
4.8 KiB
Plaintext
162 lines
4.8 KiB
Plaintext
From 48856051b2d420e2201161451de0fda8fbe640e7 Mon Sep 17 00:00:00 2001
|
|
From: Chris Roberts <cpr420@gmail.com>
|
|
Date: Wed, 18 Sep 2013 03:11:28 -0600
|
|
Subject: Fix for gcc2
|
|
|
|
|
|
diff --git a/Src/Modules/param_private.c b/Src/Modules/param_private.c
|
|
index 86416c5..b8e7c18 100644
|
|
--- a/Src/Modules/param_private.c
|
|
+++ b/Src/Modules/param_private.c
|
|
@@ -79,6 +79,7 @@ static int makeprivate_error = 0;
|
|
static void
|
|
makeprivate(HashNode hn, UNUSED(int flags))
|
|
{
|
|
+ struct gsu_closure *gsu;
|
|
Param pm = (Param)hn;
|
|
if (pm->level == locallevel) {
|
|
if (pm->ename || (pm->node.flags & PM_NORESTORE) ||
|
|
@@ -92,7 +93,7 @@ makeprivate(HashNode hn, UNUSED(int flags))
|
|
makeprivate_error = 1;
|
|
return;
|
|
}
|
|
- struct gsu_closure *gsu = zhalloc(sizeof(struct gsu_closure));
|
|
+ gsu = zhalloc(sizeof(struct gsu_closure));
|
|
switch (PM_TYPE(pm->node.flags)) {
|
|
case PM_SCALAR:
|
|
gsu->g = (void *)(pm->gsu.s);
|
|
diff --git a/Src/Zle/textobjects.c b/Src/Zle/textobjects.c
|
|
index bf83906..180e3fb 100644
|
|
--- a/Src/Zle/textobjects.c
|
|
+++ b/Src/Zle/textobjects.c
|
|
@@ -68,8 +68,9 @@ selectword(UNUSED(char **args))
|
|
}
|
|
/* similarly scan forward over characters of the same class */
|
|
while (zlecs < zlell) {
|
|
+ int pos;
|
|
INCCS();
|
|
- int pos = zlecs;
|
|
+ pos = zlecs;
|
|
/* single newlines within blanks are included */
|
|
if (all && !sclass && pos < zlell && zleline[pos] == ZWC('\n'))
|
|
INCPOS(pos);
|
|
diff --git a/Src/Zle/zle_hist.c b/Src/Zle/zle_hist.c
|
|
index 581ca49..ebe5a1b 100644
|
|
--- a/Src/Zle/zle_hist.c
|
|
+++ b/Src/Zle/zle_hist.c
|
|
@@ -1622,10 +1622,11 @@ doisearch(char **args, int dir, int pattern)
|
|
else
|
|
goto ins;
|
|
} else if (cmd == Th(z_bracketedpaste)) {
|
|
+ size_t pastelen;
|
|
char *paste = bracketedstring();
|
|
set_isrch_spot(top_spot++, hl, pos, pat_hl, pat_pos, end_pos,
|
|
zlemetacs, sbptr, dir, nomatch);
|
|
- size_t pastelen = strlen(paste);
|
|
+ pastelen = strlen(paste);
|
|
if (sbptr + pastelen >= sibuf - FIRST_SEARCH_CHAR - 2) {
|
|
int oldsize = sibuf;
|
|
sibuf += (pastelen >= sibuf) ? pastelen + 1 : sibuf;
|
|
diff --git a/Src/Zle/zle_vi.c b/Src/Zle/zle_vi.c
|
|
index e0923db..ec66f6a 100644
|
|
--- a/Src/Zle/zle_vi.c
|
|
+++ b/Src/Zle/zle_vi.c
|
|
@@ -183,11 +183,12 @@ getvirange(int wf)
|
|
vilinerange = (visual == 2);
|
|
region_active = 0;
|
|
} else {
|
|
+ Keymap km;
|
|
virangeflag = 1;
|
|
wordflag = wf;
|
|
mark = -1;
|
|
/* use operator-pending keymap if one exists */
|
|
- Keymap km = openkeymap("viopp");
|
|
+ km = openkeymap("viopp");
|
|
if (km)
|
|
selectlocalmap(km);
|
|
/* Now we need to execute the movement command, to see where it *
|
|
diff --git a/Src/params.c b/Src/params.c
|
|
index 6fbee88..451105a 100644
|
|
--- a/Src/params.c
|
|
+++ b/Src/params.c
|
|
@@ -4846,7 +4846,7 @@ arrfixenv(char *s, char **t)
|
|
int
|
|
zputenv(char *str)
|
|
{
|
|
- DPUTS(!str, "Attempt to put null string into environment.");
|
|
+ //DPUTS(!str, "Attempt to put null string into environment.");
|
|
#ifdef USE_SET_UNSET_ENV
|
|
/*
|
|
* If we are using unsetenv() to remove values from the
|
|
diff --git a/configure.ac b/configure.ac
|
|
index ec0bdae..bad78f9 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -874,7 +874,7 @@ if test x$enable_cap = xyes; then
|
|
AC_CHECK_LIB(cap, cap_get_proc)
|
|
fi
|
|
|
|
-AC_CHECK_LIB(socket, socket)
|
|
+AC_CHECK_LIB(network, socket)
|
|
AC_SEARCH_LIBS(gethostbyname2, bind)
|
|
|
|
case $LIBS in
|
|
--
|
|
2.14.1
|
|
|
|
|
|
From ae08f42563fc3b3e4831da9de566e0f496544aba Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
|
Date: Wed, 11 Jan 2017 18:17:20 +0100
|
|
Subject: Haiku rusage fix
|
|
|
|
|
|
diff --git a/Src/jobs.c b/Src/jobs.c
|
|
index 66dfb5a..47b0a64 100644
|
|
--- a/Src/jobs.c
|
|
+++ b/Src/jobs.c
|
|
@@ -940,7 +940,7 @@ should_report_time(Job j)
|
|
#endif
|
|
}
|
|
|
|
-#ifdef HAVE_GETRUSAGE
|
|
+#if defined(HAVE_GETRUSAGE) && !defined(__HAIKU__)
|
|
if (reportmemory >= 0 &&
|
|
j->procs->ti.ru_maxrss / 1024 > reportmemory)
|
|
return 1;
|
|
--
|
|
2.14.1
|
|
|
|
|
|
From b02514e4def8ad607e2d19d36a013dadb285430d Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
|
Date: Thu, 17 Aug 2017 16:16:21 +0200
|
|
Subject: Enable dynamic modules on Haiku
|
|
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index bad78f9..ae3b215 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -868,6 +868,7 @@ fi
|
|
|
|
if test "x$dynamic" = xyes; then
|
|
AC_CHECK_LIB(dl, dlopen)
|
|
+ AC_CHECK_LIB(root, dlopen)
|
|
fi
|
|
|
|
if test x$enable_cap = xyes; then
|
|
@@ -2899,7 +2900,8 @@ char *argv[];
|
|
aix*) DLLDFLAGS="${DLLDFLAGS=-G -bexpall -lc}" ;;
|
|
solaris*|sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G}" ;;
|
|
darwin*) DLLDFLAGS="${DLLDFLAGS=-bundle -flat_namespace -undefined suppress}" ;;
|
|
- beos*|haiku*) DLLDFLAGS="${DLLDFLAGS=-nostart}" ;;
|
|
+ beos*) DLLDFLAGS="${DLLDFLAGS=-nostart}" ;;
|
|
+ haiku*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
|
|
openbsd*)
|
|
if test x$zsh_cv_sys_elf = xyes; then
|
|
DLLDFLAGS="${DLLDFLAGS=-shared -fPIC}"
|
|
--
|
|
2.14.1
|
|
|