From 45a20ab721a513710138340faff3d59a31c3e01e Mon Sep 17 00:00:00 2001
From: forsyth <forsyth@lavoro.terzarima.net>
Date: Mon, 3 Jun 2013 21:01:14 +0000
Subject: sync compilers with Plan 9 remove 1[acl] 2[acl]

---
 utils/acid/expr.c     | 2 +-
 utils/acid/os-Posix.c | 1 +
 utils/acid/print.c    | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'utils/acid')

diff --git a/utils/acid/expr.c b/utils/acid/expr.c
index 4d3dcd94..826edef5 100644
--- a/utils/acid/expr.c
+++ b/utils/acid/expr.c
@@ -835,11 +835,11 @@ ocand(Node *n, Node *res)
 {
 	Node l, r;
 
-	res->nstore.fmt = l.nstore.fmt;
 	res->op = OCONST;
 	res->type = TINT;
 	res->nstore.u0.sival = 0;
 	expr(n->left, &l);
+	res->nstore.fmt = l.nstore.fmt;
 	if(bool(&l) == 0)
 		return;
 	expr(n->right, &r);
diff --git a/utils/acid/os-Posix.c b/utils/acid/os-Posix.c
index 3729db69..6e00553b 100644
--- a/utils/acid/os-Posix.c
+++ b/utils/acid/os-Posix.c
@@ -9,6 +9,7 @@
 #define	Extern extern
 #include "acid.h"
 #include <signal.h>
+#include <sys/wait.h>
 
 static void
 setraw(int fd, int baud)
diff --git a/utils/acid/print.c b/utils/acid/print.c
index 3a101b80..9ccb992b 100644
--- a/utils/acid/print.c
+++ b/utils/acid/print.c
@@ -41,7 +41,7 @@ char *typenames[] =
 };
 
 int
-cmp(const void *a, const void *b)
+cmp(void *a, void *b)
 {
 	return strcmp(*(char**)a, *(char**)b);
 }
-- 
cgit v1.2.3