commit c345061e8d81a737b2926da7ecad4b4389677fe8
from: rsc <devnull@localhost>
date: Fri Jan 07 07:47:37 2005 UTC

sunos fixes

commit - 190857f93ec5743f7c3209ac8544440b3cedfcee
commit + c345061e8d81a737b2926da7ecad4b4389677fe8
blob - b7319ae5a7a9cc677d0a7646bc9442bce07fb1f2
blob + df82ac5921930c77f6eaf9666dfaf0109c146756
--- include/u.h
+++ include/u.h
@@ -6,6 +6,7 @@ extern "C" {
 
 #define __BSD_VISIBLE 1 /* FreeBSD 5.x */
 #define __EXTENSIONS__ 1 /* SunOS */
+#define __MAKECONTEXT_V2_SOURCE 1 /* SunOS */
 #define _BSD_SOURCE 1
 #define _SVID_SOURCE 1
 #define _XOPEN_SOURCE 1000
blob - d623f4e8c0b5b577b4b0d23b07c7e4d480ef2185
blob + 130067f654ead725cd2259e51274e6250dc8a21b
--- src/cmd/draw/colors.c
+++ 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);
 
blob - d516631879cf1ab4a4ac970c2f8a2fa94c14bb63
blob + 97bbc928ff5d0fc0bdec10d658522407619029d4
--- src/lib9/fmt/dofmt.c
+++ src/lib9/fmt/dofmt.c
@@ -78,7 +78,6 @@ dofmt(Fmt *f, char *fmt)
 		if(fmt == nil)
 			return -1;
 	}
-	return 0;	/* not reached */
 }
 
 void *
blob - bef81f0b6527647661c8835e23918e3a66b819f4
blob + fbc1c59ec0880d0dcf5de36c631e6027a0160f96
--- src/lib9/fmt/strtod.c
+++ src/lib9/fmt/strtod.c
@@ -377,7 +377,6 @@ fpcmp(char *a, ulong* f)
 		a++;
 	cont:;
 	}
-	return 0;
 }
 
 static void
blob - a979c4433b52faa371874fae919d444ed4427a06
blob + 7d9d064a069b8c3815c9e681d2f4f4b6e80c2f31
--- src/lib9/qlock.c
+++ src/lib9/qlock.c
@@ -100,7 +100,6 @@ canrlock(RWLock *l)
 		l->readers++;
 		return 1;
 	}
-	return 1;
 }
 
 void
blob - 56f65febfc751edc65d2f63faff0091e6cb15fc8
blob + 769805a5a39c58d1f0d6eb6dfc0adeafe94f2f63
--- src/lib9/utf/utflen.c
+++ src/lib9/utf/utflen.c
@@ -34,5 +34,4 @@ utflen(char *s)
 			s += chartorune(&rune, s);
 		n++;
 	}
-	return 0;
 }
blob - 63f0c43cf8859933c2ac0b62cc0a7ea14cf47903
blob + cff12b5e245f9c1ad7bf66d8fea71f5523f9ba28
--- src/lib9/utf/utfrrune.c
+++ src/lib9/utf/utfrrune.c
@@ -42,5 +42,4 @@ utfrrune(char *s, long c)
 			s1 = s;
 		s += c1;
 	}
-	return 0;
 }
blob - c954c7889411707935bae03d1c0244f8146ccfc3
blob + 52b83599ea7bb767eeb1069755f83fe7dfe7299d
--- src/lib9/utf/utfrune.c
+++ src/lib9/utf/utfrune.c
@@ -41,5 +41,4 @@ utfrune(char *s, long c)
 			return s;
 		s += n;
 	}
-	return 0;
 }
blob - e46dc125fb0d1f8a67341dc614a169aa8f32efa2
blob + 86c9bf0c91a4e6f3c89e9437eb6e9d3efa4b148f
--- src/libString/s_getline.c
+++ src/libString/s_getline.c
@@ -68,5 +68,4 @@ s_getline(Biobuf *fp, String *to)
 		}
 		c = Bgetc(fp);
 	}
-	return 0;
 }
blob - b3612a5356973dfa81535f416b282e6c5873f351
blob + 52baf517178584aa36f24c7b397f00f420b53fc8
--- src/libbio/brdstr.c
+++ 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 */
 }
blob - b80bd2e9997ebad6ad3e138020c5e13d8d216f8e
blob + 0ccd8c0e0102753ad6fd89731a72b85267d5f6e2
--- src/libdraw/x11-draw.c
+++ 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,
blob - 38eb7d78cc07ebd507b22d0cd0208b82d2ac0796
blob + dbeda7e44f239978228d27c90b1d1c6c65e1f663
--- src/libthread/pthread.c
+++ 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){
blob - 7734f7767d7e8f793d930e4f3024b38a32880e05
blob + 83b83556f626b8ca8a86b8e026153217b41633d4
--- src/libthread/sysofiles.sh
+++ 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