From c345061e8d81a737b2926da7ecad4b4389677fe8 Mon Sep 17 00:00:00 2001
From: rsc <devnull@localhost>
Date: Fri, 7 Jan 2005 07:47:37 +0000
Subject: sunos fixes

---
 src/cmd/draw/colors.c      | 2 +-
 src/lib9/fmt/dofmt.c       | 1 -
 src/lib9/fmt/strtod.c      | 1 -
 src/lib9/qlock.c           | 1 -
 src/lib9/utf/utflen.c      | 1 -
 src/lib9/utf/utfrrune.c    | 1 -
 src/lib9/utf/utfrune.c     | 1 -
 src/libString/s_getline.c  | 1 -
 src/libbio/brdstr.c        | 1 -
 src/libdraw/x11-draw.c     | 3 ++-
 src/libthread/pthread.c    | 6 +++---
 src/libthread/sysofiles.sh | 8 +++++++-
 12 files changed, 13 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/cmd/draw/colors.c b/src/cmd/draw/colors.c
index d623f4e8..130067f6 100644
--- a/src/cmd/draw/colors.c
+++ b/src/cmd/draw/colors.c
@@ -106,7 +106,7 @@ main(int argc, char *argv[])
 		exits("usage");
 	}
 
-	if(initdraw(nil, nil, "colors") < 0)
+	if(initdraw(0, 0, "colors") < 0)
 		sysfatal("initdraw failed: %r");
 	einit(Emouse);
 
diff --git a/src/lib9/fmt/dofmt.c b/src/lib9/fmt/dofmt.c
index d5166318..97bbc928 100644
--- a/src/lib9/fmt/dofmt.c
+++ b/src/lib9/fmt/dofmt.c
@@ -78,7 +78,6 @@ dofmt(Fmt *f, char *fmt)
 		if(fmt == nil)
 			return -1;
 	}
-	return 0;	/* not reached */
 }
 
 void *
diff --git a/src/lib9/fmt/strtod.c b/src/lib9/fmt/strtod.c
index bef81f0b..fbc1c59e 100644
--- a/src/lib9/fmt/strtod.c
+++ b/src/lib9/fmt/strtod.c
@@ -377,7 +377,6 @@ fpcmp(char *a, ulong* f)
 		a++;
 	cont:;
 	}
-	return 0;
 }
 
 static void
diff --git a/src/lib9/qlock.c b/src/lib9/qlock.c
index a979c443..7d9d064a 100644
--- a/src/lib9/qlock.c
+++ b/src/lib9/qlock.c
@@ -100,7 +100,6 @@ canrlock(RWLock *l)
 		l->readers++;
 		return 1;
 	}
-	return 1;
 }
 
 void
diff --git a/src/lib9/utf/utflen.c b/src/lib9/utf/utflen.c
index 56f65feb..769805a5 100644
--- a/src/lib9/utf/utflen.c
+++ b/src/lib9/utf/utflen.c
@@ -34,5 +34,4 @@ utflen(char *s)
 			s += chartorune(&rune, s);
 		n++;
 	}
-	return 0;
 }
diff --git a/src/lib9/utf/utfrrune.c b/src/lib9/utf/utfrrune.c
index 63f0c43c..cff12b5e 100644
--- a/src/lib9/utf/utfrrune.c
+++ b/src/lib9/utf/utfrrune.c
@@ -42,5 +42,4 @@ utfrrune(char *s, long c)
 			s1 = s;
 		s += c1;
 	}
-	return 0;
 }
diff --git a/src/lib9/utf/utfrune.c b/src/lib9/utf/utfrune.c
index c954c788..52b83599 100644
--- a/src/lib9/utf/utfrune.c
+++ b/src/lib9/utf/utfrune.c
@@ -41,5 +41,4 @@ utfrune(char *s, long c)
 			return s;
 		s += n;
 	}
-	return 0;
 }
diff --git a/src/libString/s_getline.c b/src/libString/s_getline.c
index e46dc125..86c9bf0c 100644
--- a/src/libString/s_getline.c
+++ b/src/libString/s_getline.c
@@ -68,5 +68,4 @@ s_getline(Biobuf *fp, String *to)
 		}
 		c = Bgetc(fp);
 	}
-	return 0;
 }
diff --git a/src/libbio/brdstr.c b/src/libbio/brdstr.c
index b3612a53..52baf517 100644
--- a/src/libbio/brdstr.c
+++ b/src/libbio/brdstr.c
@@ -108,5 +108,4 @@ Brdstr(Biobuf *bp, int delim, int nulldelim)
 		bp->icount = 0;
 		bp->gbuf = bp->ebuf;
 	}
-	return 0;	/* never happens */
 }
diff --git a/src/libdraw/x11-draw.c b/src/libdraw/x11-draw.c
index b80bd2e9..0ccd8c0e 100644
--- a/src/libdraw/x11-draw.c
+++ b/src/libdraw/x11-draw.c
@@ -115,7 +115,7 @@ xdraw(Memdrawparam *par)
 		}else{
 			/* this doesn't work on rob's mac?  */
 			return 0;
-			gc = _x.gcsimplesrc;
+			/* gc = _x.gcsimplesrc;
 			if(dst->chan == CMAP8 && _x.usetable)
 				sdval = _x.tox11[sdval];
 
@@ -127,6 +127,7 @@ xdraw(Memdrawparam *par)
 				XSetStipple(_x.display, gc, xmask->pixmap);
 				_x.gcsimplesrcpixmap = xmask->pixmap;
 			}
+			*/
 		}
 		XSetTSOrigin(_x.display, gc, mp.x, mp.y);
 		XFillRectangle(_x.display, xdst->pixmap, gc, dp.x, dp.y,
diff --git a/src/libthread/pthread.c b/src/libthread/pthread.c
index 38eb7d78..dbeda7e4 100644
--- a/src/libthread/pthread.c
+++ b/src/libthread/pthread.c
@@ -74,7 +74,7 @@ _procwakeupandunlock(_Procrendez *r)
 		r->asleep = 0;
 		pthread_cond_signal(&r->cond);
 	}
-	unlock(&r->l);
+	unlock(r->l);
 }
 
 static void
@@ -85,7 +85,7 @@ startprocfn(void *v)
 	Proc *p;
 
 	a = (void**)v;
-	fn = a[0];
+	fn = (void(*)(void*))a[0];
 	p = a[1];
 	free(a);
 	p->osprocid = pthread_self();
@@ -104,7 +104,7 @@ _procstart(Proc *p, void (*fn)(Proc*))
 	a = malloc(2*sizeof a[0]);
 	if(a == nil)
 		sysfatal("_procstart malloc: %r");
-	a[0] = fn;
+	a[0] = (void*)fn;
 	a[1] = p;
 
 	if(pthread_create(&p->osprocid, nil, (void*(*)(void*))startprocfn, (void*)a) < 0){
diff --git a/src/libthread/sysofiles.sh b/src/libthread/sysofiles.sh
index 7734f776..83b83556 100644
--- a/src/libthread/sysofiles.sh
+++ b/src/libthread/sysofiles.sh
@@ -8,7 +8,13 @@ case "$tag" in
 *-FreeBSD-5.*)
 	echo pthread.o
 	;;
-*)
+*-Linux-*)
+	echo `uname`.o `uname`asm.o
+	;;
+*-FreeBSD-*)
 	echo `uname`.o `uname`asm.o
+	;;
+*)
+	echo pthread.o
 esac
 
-- 
cgit v1.2.3