applied Sebastian Liem's OpenBSD patch, thanks!

This commit is contained in:
anselm@garbe.us
2010-07-19 07:49:13 +01:00
parent 5abaddc5f0
commit a3b65ffcdc
2 changed files with 4 additions and 3 deletions

View File

@@ -121,7 +121,7 @@ void setnoaddr(void);
void setwide(void); void setwide(void);
void squeeze(int); void squeeze(int);
void substitute(int); void substitute(int);
char* _mktemp(char *as); char* __mktemp(char *as);
Rune La[] = { 'a', 0 }; Rune La[] = { 'a', 0 };
Rune Lr[] = { 'r', 0 }; Rune Lr[] = { 'r', 0 };
@@ -162,7 +162,7 @@ main(int argc, char *argv[])
globp = Lr; globp = Lr;
} }
zero = malloc((nlall+5)*sizeof(int*)); zero = malloc((nlall+5)*sizeof(int*));
tfname = _mktemp(tmp); tfname = __mktemp(tmp);
init(); init();
setjmp(savej); setjmp(savej);
commands(); commands();
@@ -1584,7 +1584,7 @@ putchr(int ac)
} }
char* char*
_mktemp(char *as) __mktemp(char *as)
{ {
char *s; char *s;
unsigned pid; unsigned pid;

View File

@@ -44,6 +44,7 @@ disksize(int fd, struct stat *st)
#define _HAVESTGEN #define _HAVESTGEN
#include <sys/disklabel.h> #include <sys/disklabel.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/dkio.h>
static vlong static vlong
disksize(int fd, struct stat *st) disksize(int fd, struct stat *st)
{ {