errno and ANSI fixes.

3 files changed, 45 insertions, 1 deletions

diff --git a/x11/xp/distinfo b/x11/xp/distinfo
index 03432782565..4170a65f48b 100644
--- a/x11/xp/distinfo
+++ b/x11/xp/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 17:36:24 wiz Exp $
+$NetBSD: distinfo,v 1.4 2005/12/04 01:21:00 joerg Exp $
 
 SHA1 (xp-1.2b10.tar.gz) = 70b232966ee2483ceb8f0ae8f0ef0cf7b899104b
 RMD160 (xp-1.2b10.tar.gz) = 035f6f7dd3143e220ab454388d1632788e9e2bd3
 Size (xp-1.2b10.tar.gz) = 43036 bytes
 SHA1 (patch-aa) = 0d6fa753ff8010ba6264b0bfc19e44c3a5f723ce
 SHA1 (patch-ab) = 62b440dd9e5ee419113589d3758a1a6bcba35f5d
+SHA1 (patch-ac) = bcd9e2b83c9e7be3ee8e56e24110a970f8635bb3
+SHA1 (patch-ad) = 40cba728947de06e1fb118527a940b9cdea4fb48
diff --git a/x11/xp/patches/patch-ac b/x11/xp/patches/patch-ac
new file mode 100644
index 00000000000..cb7e80ae432
--- /dev/null
+++ b/x11/xp/patches/patch-ac
@@ -0,0 +1,21 @@
+$NetBSD: patch-ac,v 1.1 2005/12/04 01:21:00 joerg Exp $
+
+--- xp.c.orig	2005-12-04 00:57:12.000000000 +0000
++++ xp.c
+@@ -434,7 +434,6 @@ newfile(file,data, size)
+     int size;
+ 
+ {
+-    extern int errno;
+     extern char* uerror();
+     extern char* readfile();
+     char *mess = NULL;
+@@ -649,8 +648,6 @@ main (argc, argv)
+     filedata = readfile(argc > 1 ? argv[1] : "-", &size);
+ 
+     if (argc == 2 && !filedata) {
+-	extern int errno;
+-
+ 	fprintf(stderr,"%s: %s: %s\n", argv[0], argv[1], uerror());
+ 	exit (1);
+     }
diff --git a/x11/xp/patches/patch-ad b/x11/xp/patches/patch-ad
new file mode 100644
index 00000000000..4bfc4f31180
--- /dev/null
+++ b/x11/xp/patches/patch-ad
@@ -0,0 +1,21 @@
+$NetBSD: patch-ad,v 1.1 2005/12/04 01:21:00 joerg Exp $
+
+--- mysystem.c.orig	2005-12-04 00:58:03.000000000 +0000
++++ mysystem.c
+@@ -1,15 +1,12 @@
+ #include <errno.h>
+ #include <signal.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <X11/Xos.h>
+ #include <X11/Intrinsic.h>
+ #include "mysystem.h"
+ #include "appres.h"
+ 
+-extern char *malloc();
+-extern char *getenv();
+-
+-extern int	errno;
+ extern Argc;
+ extern char **Argv;
+ extern AppResources app_resources;