[hackers] [9base] applied Sebastian Liem's OpenBSD patch, thanks! || anselm

changeset: 77:351055ae4ff5
tag: tip
user: anselm_AT_garbe.us
date: Mon Jul 19 07:49:13 2010 +0100
files: ed/ed.c lib9/_p9dir.c
description:
applied Sebastian Liem's OpenBSD patch, thanks!

diff -r 09af6227574f -r 351055ae4ff5 ed/ed.c
--- a/ed/ed.c Fri Jun 04 11:44:25 2010 +0100
+++ b/ed/ed.c Mon Jul 19 07:49:13 2010 +0100
@@ -121,7 +121,7 @@
 void setwide(void);
 void squeeze(int);
 void substitute(int);
-char* _mktemp(char *as);
+char* __mktemp(char *as);
 
 Rune La[] = { 'a', 0 };
 Rune Lr[] = { 'r', 0 };
@@ -162,7 +162,7 @@
                 globp = Lr;
         }
         zero = malloc((nlall+5)*sizeof(int*));
- tfname = _mktemp(tmp);
+ tfname = __mktemp(tmp);
         init();
         setjmp(savej);
         commands();
@@ -1584,7 +1584,7 @@
 }
 
 char*
-_mktemp(char *as)
+__mktemp(char *as)
 {
         char *s;
         unsigned pid;
diff -r 09af6227574f -r 351055ae4ff5 lib9/_p9dir.c
--- a/lib9/_p9dir.c Fri Jun 04 11:44:25 2010 +0100
+++ b/lib9/_p9dir.c Mon Jul 19 07:49:13 2010 +0100
@@ -44,6 +44,7 @@
 #define _HAVESTGEN
 #include <sys/disklabel.h>
 #include <sys/ioctl.h>
+#include <sys/dkio.h>
 static vlong
 disksize(int fd, struct stat *st)
 {
Received on Mon Jul 19 2010 - 08:51:46 CEST