Index: Make.unix
===================================================================
RCS file: /cvs/drawterm/Make.unix,v
retrieving revision 1.11
diff -b -u -w -r1.11 Make.unix
--- Make.unix	8 Mar 2006 04:24:23 -0000	1.11
+++ Make.unix	28 Apr 2006 20:26:22 -0000
@@ -6,12 +6,15 @@
 RANLIB=ranlib
 X11=/usr/X11R6
 CC=gcc
+CC=cc -xCC
 CFLAGS=-Wall -Wno-missing-braces -ggdb -I$(ROOT) -I$(ROOT)/include -I$(ROOT)/kern -c -I$(X11)/include -D_THREAD_SAFE $(PTHREAD) -O2
+CFLAGS=-I$(ROOT) -I$(ROOT)/include -I$(ROOT)/kern  -c -g -D_THREAD_SAFE
 O=o
 OS=posix
 GUI=x11
 LDADD=-L$(X11)/lib -lX11 -ggdb
-LDFLAGS=$(PTHREAD)
+LDADD=-L/usr/X11R6/lib -lX11 -lrt -lpthread -lsocket -lnsl
+# LDFLAGS=$(PTHREAD)
 TARG=drawterm
 # AUDIO=none
 AUDIO=unix
Index: README
===================================================================
RCS file: /cvs/drawterm/README,v
retrieving revision 1.6
diff -b -u -w -r1.6 README
--- README	17 Jan 2006 12:47:53 -0000	1.6
+++ README	28 Apr 2006 20:26:22 -0000
@@ -2,6 +2,11 @@
 --------------
 To build on Unix, run CONF=unix make.

+On solaris 8.5,
+using sun cc: Sun WorkShop 6 2000/04/07 C 5.1
+and gnu make 3.79.1, run    make 'CONF=unix' 'AUDIO=none'
+
+
 To build on Windows, you need Mingw.  See http://www.mingw.org.
 Edit Make.config to uncomment the Windows section
 and comment out the rest.  Then run CONF=windows make.
Index: include/auth.h
===================================================================
RCS file: /cvs/drawterm/include/auth.h,v
retrieving revision 1.2
diff -b -u -w -r1.2 auth.h
--- include/auth.h	7 Nov 2005 17:13:38 -0000	1.2
+++ include/auth.h	28 Apr 2006 20:26:23 -0000
@@ -17,7 +17,9 @@
 enum
 {
 	MAXCHLEN=	256,		/* max challenge length	*/
+#ifndef MAXNAMELEN
 	MAXNAMELEN=	256,		/* maximum name length */
+#endif
 	MD5LEN=		16,

 	ARok = 0,			/* rpc return values */
Index: include/dtos.h
===================================================================
RCS file: /cvs/drawterm/include/dtos.h,v
retrieving revision 1.5
diff -b -u -w -r1.5 dtos.h
--- include/dtos.h	29 Dec 2005 23:41:14 -0000	1.5
+++ include/dtos.h	28 Apr 2006 20:26:23 -0000
@@ -1,4 +1,4 @@
-#if defined(linux) || defined(IRIX) || defined(SOLARIS) || defined(OSF1) || defined(__FreeBSD__) || defined(__APPLE__) || defined(__NetBSD__)
+#if defined(linux) || defined(IRIX) || defined(__sun) || defined(OSF1) || defined(__FreeBSD__) || defined(__APPLE__) || defined(__NetBSD__)
 #	include "unix.h"
 #	ifdef __APPLE__
 #		define panic dt_panic
Index: kern/devaudio.c
===================================================================
RCS file: /cvs/drawterm/kern/devaudio.c,v
retrieving revision 1.1
diff -b -u -w -r1.1 devaudio.c
--- kern/devaudio.c	8 Mar 2006 04:24:23 -0000	1.1
+++ kern/devaudio.c	28 Apr 2006 20:26:23 -0000
@@ -45,17 +45,17 @@
 	int	irval;
 } volumes[] =
 {
-[Vaudio]		"audio",	Fout, 		50,	50,
-[Vsynth]		"synth",	Fin|Fout,	0,	0,
-[Vcd]		"cd",		Fin|Fout,	0,	0,
-[Vline]		"line",	Fin|Fout,	0,	0,
-[Vmic]		"mic",	Fin|Fout|Fmono,	0,	0,
-[Vspeaker]	"speaker",	Fout|Fmono,	0,	0,
+/*[Vaudio]*/		"audio",	Fout, 		50,	50,
+/*[Vsynth]*/		"synth",	Fin|Fout,	0,	0,
+/*[Vcd]*/		"cd",		Fin|Fout,	0,	0,
+/*[Vline]*/		"line",	Fin|Fout,	0,	0,
+/*[Vmic]*/		"mic",	Fin|Fout|Fmono,	0,	0,
+/*[Vspeaker]*/	"speaker",	Fout|Fmono,	0,	0,

-[Vtreb]		"treb",		Fout, 		50,	50,
-[Vbass]		"bass",		Fout, 		50,	50,
+/*[Vtreb]*/		"treb",		Fout, 		50,	50,
+/*[Vbass]*/		"bass",		Fout, 		50,	50,

-[Vspeed]	"speed",	Fin|Fout|Fmono,	Speed,	Speed,
+/*[Vspeed]*/	"speed",	Fin|Fout|Fmono,	Speed,	Speed,
 		0
 };

Index: kern/devtls.c
===================================================================
RCS file: /cvs/drawterm/kern/devtls.c,v
retrieving revision 1.1
diff -b -u -w -r1.1 devtls.c
--- kern/devtls.c	4 Apr 2006 11:38:40 -0000	1.1
+++ kern/devtls.c	28 Apr 2006 20:26:23 -0000
@@ -241,14 +241,18 @@
 static void	pdump(int, void*, char*);

 static char *tlsnames[] = {
-[Qclonus]		"clone",
-[Qencalgs]	"encalgs",
-[Qhashalgs]	"hashalgs",
-[Qdata]		"data",
-[Qctl]		"ctl",
-[Qhand]		"hand",
-[Qstatus]		"status",
-[Qstats]		"stats",
+/*0*/	0,
+/*Qtopdir*/	0,
+/*Qprotodir*/	0,
+/*[Qclonus]*/		"clone",
+/*[Qencalgs]*/	"encalgs",
+/*[Qhashalgs]*/	"hashalgs",
+/*Qconvdir*/	0,
+/*[Qdata]*/		"data",
+/*[Qctl]*/		"ctl",
+/*[Qhand]*/		"hand",
+/*[Qstatus]*/		"status",
+/*[Qstats]*/		"stats",
 };

 static int convdir[] = { Qctl, Qdata, Qhand, Qstatus, Qstats };