summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjdc <jdc>2006-08-22 20:20:20 +0000
committerjdc <jdc>2006-08-22 20:20:20 +0000
commitd1d45cad78b51f683f1f859b4effdb1bb2adef2f (patch)
tree91ff93f782577858aa9789d4246f5f2495a2b024 /x11
parent1f7ce93255690cd0f92fa3b276c5bff021da2e0b (diff)
downloadpkgsrc-d1d45cad78b51f683f1f859b4effdb1bb2adef2f.tar.gz
Make this compile with gcc4.
Diffstat (limited to 'x11')
-rw-r--r--x11/xp/patches/patch-ac31
1 files changed, 28 insertions, 3 deletions
diff --git a/x11/xp/patches/patch-ac b/x11/xp/patches/patch-ac
index cb7e80ae432..138d3bef017 100644
--- a/x11/xp/patches/patch-ac
+++ b/x11/xp/patches/patch-ac
@@ -1,8 +1,16 @@
-$NetBSD: patch-ac,v 1.1 2005/12/04 01:21:00 joerg Exp $
+$NetBSD: patch-ac,v 1.2 2006/08/22 20:20:20 jdc Exp $
--- xp.c.orig 2005-12-04 00:57:12.000000000 +0000
+++ xp.c
-@@ -434,7 +434,6 @@ newfile(file,data, size)
+@@ -32,6 +32,7 @@
+ */
+
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <errno.h>
+ #include <signal.h>
+ #include <sys/wait.h>
+@@ -434,7 +435,6 @@
int size;
{
@@ -10,7 +18,7 @@ $NetBSD: patch-ac,v 1.1 2005/12/04 01:21:00 joerg Exp $
extern char* uerror();
extern char* readfile();
char *mess = NULL;
-@@ -649,8 +648,6 @@ main (argc, argv)
+@@ -649,8 +649,6 @@
filedata = readfile(argc > 1 ? argv[1] : "-", &size);
if (argc == 2 && !filedata) {
@@ -19,3 +27,20 @@ $NetBSD: patch-ac,v 1.1 2005/12/04 01:21:00 joerg Exp $
fprintf(stderr,"%s: %s: %s\n", argv[0], argv[1], uerror());
exit (1);
}
+@@ -1677,6 +1675,8 @@
+ *
+ */
+
++static void shellr();
++
+ /*ARGSUSED*/
+ static void
+ Cmnd(w, event,params,num_params)
+@@ -1688,7 +1688,6 @@
+
+ char *linesearch();
+ char *lastlinesearch();
+- static void shellr();
+ String userdata;
+ textextra *te;
+ static char cmndbuf[BUFSIZ];