aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordemon <demon@FreeBSD.org>2004-07-06 16:57:49 +0800
committerdemon <demon@FreeBSD.org>2004-07-06 16:57:49 +0800
commitdbb4d63dbfcd37f9f6620c1dd13662b87c0a4671 (patch)
treea05ac7b76ec5b8e9067f572f5f72165d5f5bef6b
parent7f670404bdfe98fc8329066c06e9a6f7a15e3ff5 (diff)
downloadfreebsd-ports-gnome-dbb4d63dbfcd37f9f6620c1dd13662b87c0a4671.tar.gz
freebsd-ports-gnome-dbb4d63dbfcd37f9f6620c1dd13662b87c0a4671.tar.zst
freebsd-ports-gnome-dbb4d63dbfcd37f9f6620c1dd13662b87c0a4671.zip
Fix build on -current.
-rw-r--r--net/clusterit/files/patch-dsh-dsh.c24
1 files changed, 20 insertions, 4 deletions
diff --git a/net/clusterit/files/patch-dsh-dsh.c b/net/clusterit/files/patch-dsh-dsh.c
index 0a023580cea7..4ef10aaf29d9 100644
--- a/net/clusterit/files/patch-dsh-dsh.c
+++ b/net/clusterit/files/patch-dsh-dsh.c
@@ -1,18 +1,34 @@
---- dsh/dsh.c.orig Fri Jul 2 12:50:52 2004
-+++ dsh/dsh.c Fri Jul 2 12:51:08 2004
-@@ -76,6 +76,7 @@
+--- dsh/dsh.c.orig Tue Jul 6 12:49:37 2004
++++ dsh/dsh.c Tue Jul 6 12:53:51 2004
+@@ -35,6 +35,7 @@
+ #include <sys/types.h>
+ #include <sys/resource.h>
+ #include <sys/wait.h>
++#include <sys/param.h>
+
+ #include <errno.h>
+ #include <fcntl.h>
+@@ -76,6 +77,11 @@
{
extern char *optarg;
extern int optind;
++#if __FreeBSD_version < 500000
+ extern char *malloc_options;
++#else
++ extern const char *_malloc_options;
++#endif
int someflag, ch, i, fanout, showflag, fanflag;
char *p, *q, *group, *nodename, *username;
-@@ -93,6 +94,7 @@
+@@ -93,6 +99,11 @@
nodeptr = NULL;
nodelink = NULL;
++#if __FreeBSD_version < 500000
+ malloc_options = "Z";
++#else
++ _malloc_options = "Z";
++#endif
rungroup = malloc(sizeof(char **) * GROUP_MALLOC);
if (rungroup == NULL)
bailout(__LINE__);