Solaris 9 also wants our own unsetenv/setenv.

diff --git a/combine-diff.c b/combine-diff.c
index 4657eb4c33b2711dffe99fe1e8a4e19608761ce3..eb0d757f47b74161c4bfc1212f4510a6790ff92a 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -151,7 +151,8 @@ static void append_lost(struct sline *sline, int n, const char *line, int len)
 struct combine_diff_state {
        struct xdiff_emit_state xm;
 
-       unsigned int lno, ob, on, nb, nn;
+       unsigned int lno;
+       int ob, on, nb, nn;
        unsigned long nmask;
        int num_parent;
        int n;