summaryrefslogtreecommitdiff
path: root/src/libbio
diff options
context:
space:
mode:
authorAnthony Martin <ality@pbrane.org>2013-12-09 18:39:58 -0500
committerAnthony Martin <ality@pbrane.org>2013-12-09 18:39:58 -0500
commitbc034b7d63040f413568495b7f82dd509b0d9e18 (patch)
tree21abea74d64e37072aab3053f2be620f2f0150ea /src/libbio
parent356e4e5ee3fb5e48f50047b8212234777410aebc (diff)
downloadgo-bc034b7d63040f413568495b7f82dd509b0d9e18.tar.gz
build: do not use the host's libbio on Plan 9
R=jas, lucio.dere, rsc CC=golang-dev https://codereview.appspot.com/14604047 Committer: Russ Cox <rsc@golang.org>
Diffstat (limited to 'src/libbio')
-rw-r--r--src/libbio/bgetrune.c1
-rw-r--r--src/libbio/bprint.c2
-rw-r--r--src/libbio/bputrune.c1
-rw-r--r--src/libbio/bseek.c2
4 files changed, 3 insertions, 3 deletions
diff --git a/src/libbio/bgetrune.c b/src/libbio/bgetrune.c
index 441c07991..b5db39106 100644
--- a/src/libbio/bgetrune.c
+++ b/src/libbio/bgetrune.c
@@ -26,7 +26,6 @@ THE SOFTWARE.
#include <u.h>
#include <libc.h>
#include <bio.h>
-#include <utf.h>
long
Bgetrune(Biobuf *bp)
diff --git a/src/libbio/bprint.c b/src/libbio/bprint.c
index 301dc0c7f..06748e7ac 100644
--- a/src/libbio/bprint.c
+++ b/src/libbio/bprint.c
@@ -67,7 +67,9 @@ Bvprint(Biobuf *bp, char *fmt, va_list arg)
Fmt f;
memset(&f, 0, sizeof f);
+#ifndef PLAN9
fmtlocaleinit(&f, nil, nil, nil);
+#endif
f.stop = bp->ebuf;
f.to = (char*)f.stop + bp->ocount;
f.flush = bflush;
diff --git a/src/libbio/bputrune.c b/src/libbio/bputrune.c
index 7fe0e6569..0b4745ab4 100644
--- a/src/libbio/bputrune.c
+++ b/src/libbio/bputrune.c
@@ -26,7 +26,6 @@ THE SOFTWARE.
#include <u.h>
#include <libc.h>
#include <bio.h>
-#include <utf.h>
int
Bputrune(Biobuf *bp, long c)
diff --git a/src/libbio/bseek.c b/src/libbio/bseek.c
index eb426ccfc..528958510 100644
--- a/src/libbio/bseek.c
+++ b/src/libbio/bseek.c
@@ -33,7 +33,7 @@ Bseek(Biobuf *bp, vlong offset, int base)
vlong n, d;
int bufsz;
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(PLAN9)
if(sizeof(offset) != sizeof(off_t)) {
fprint(2, "Bseek: libbio compiled with %d-byte offset\n", sizeof(off_t));
abort();