Index: asterisk-1.4.10.1/channels/chan_oss.c
===================================================================
--- asterisk-1.4.10.1/channels/chan_oss.c	(revision 1)
+++ asterisk-1.4.10.1/channels/chan_oss.c	(working copy)
@@ -56,7 +56,7 @@
 #elif defined(__FreeBSD__)
 #include <sys/soundcard.h>
 #else
-#include <soundcard.h>
+#include <sys/soundcard.h>
 #endif
 
 #include "asterisk/lock.h"
@@ -210,6 +210,7 @@
  * XXX NOTE these macros should NOT be replicated in other parts of asterisk. 
  * Likely we will come up with a better way of doing config file parsing.
  */
+/*#undef M_START*/
 #define M_START(var, val) \
         char *__s = var; char *__val = val;
 #define M_END(x)   x;
@@ -335,7 +336,14 @@
 
 	int total_blocks;			/* total blocks in the output device */
 	int sounddev;
-	enum { M_UNSET, M_FULL, M_READ, M_WRITE } duplex;
+	/*enum { M_UNSET, M_FULL, M_READ, M_WRITE } duplex;*/
+#undef M_UNSET
+#undef M_FULL
+#undef M_READ
+#undef M_WRITE
+
+enum { M_UNSET, M_FULL, M_READ, M_WRITE } duplex;
+
 	int autoanswer;
 	int autohangup;
 	int hookstate;
Index: asterisk-1.4.10.1/apps/app_queue.c
===================================================================
--- asterisk-1.4.10.1/apps/app_queue.c	(revision 1)
+++ asterisk-1.4.10.1/apps/app_queue.c	(working copy)
@@ -4468,35 +4468,35 @@
 "Usage: queue remove member <channel> from <queue>\n";
 
 static struct ast_cli_entry cli_show_queue_deprecated = {
-	{ "show", "queue", NULL },
-	queue_show, NULL,
-	NULL, complete_queue_show };
+	{ "show", "queue", "" },
+	queue_show, "",
+	"", complete_queue_show };
 
 static struct ast_cli_entry cli_add_queue_member_deprecated = {
-	{ "add", "queue", "member", NULL },
-	handle_queue_add_member, NULL,
-	NULL, complete_queue_add_member };
+	{ "add", "queue", "member", "" },
+	handle_queue_add_member, "",
+	"", complete_queue_add_member };
 
 static struct ast_cli_entry cli_remove_queue_member_deprecated = {
-	{ "remove", "queue", "member", NULL },
-	handle_queue_remove_member, NULL,
-	NULL, complete_queue_remove_member };
+	{ "remove", "queue", "member", "" },
+	handle_queue_remove_member, "",
+	"", complete_queue_remove_member };
 
 static struct ast_cli_entry cli_queue[] = {
 	/* Deprecated */
-	{ { "show", "queues", NULL },
-	queue_show, NULL,
-	NULL, NULL },
+	{ { "show", "queues", "" },
+	queue_show, "",
+	"", "" },
 
-	{ { "queue", "show", NULL },
+	{ { "queue", "show", "" },
 	queue_show, "Show status of a specified queue",
 	queue_show_usage, complete_queue_show, &cli_show_queue_deprecated },
 
-	{ { "queue", "add", "member", NULL },
+	{ { "queue", "add", "member", "" },
 	handle_queue_add_member, "Add a channel to a specified queue",
 	qam_cmd_usage, complete_queue_add_member, &cli_add_queue_member_deprecated },
 
-	{ { "queue", "remove", "member", NULL },
+	{ { "queue", "remove", "member", "" },
 	handle_queue_remove_member, "Removes a channel from a specified queue",
 	qrm_cmd_usage, complete_queue_remove_member, &cli_remove_queue_member_deprecated },
 };
Index: asterisk-1.4.10.1/Makefile
===================================================================
--- asterisk-1.4.10.1/Makefile	(revision 1)
+++ asterisk-1.4.10.1/Makefile	(working copy)
@@ -224,7 +224,8 @@
 endif
 
 ifeq ($(OSARCH),SunOS)
-  ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include
+  ASTCFLAGS+=-Wcast-align -g -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include -I/opt/csw/include
+  ASTLDFLAGS+=-R/usr/sfw/lib -R/opt/csw/lib -L/opt/csw/lib -L/usr/sfw/lib -lrt
 endif
 
 ASTERISKVERSION:=$(shell build_tools/make_version .)
Index: asterisk-1.4.10.1/main/utils.c
===================================================================
--- asterisk-1.4.10.1/main/utils.c	(revision 1)
+++ asterisk-1.4.10.1/main/utils.c	(working copy)
@@ -67,6 +67,7 @@
 static char base64[64];
 static char b2a[256];
 
+#define HAVE_GETHOSTBYNAME_R 1
 AST_THREADSTORAGE(inet_ntoa_buf, inet_ntoa_buf_init);
 
 #if !defined(HAVE_GETHOSTBYNAME_R_5) && !defined(HAVE_GETHOSTBYNAME_R_6)
Index: asterisk-1.4.10.1/makeopts.in
===================================================================
--- asterisk-1.4.10.1/makeopts.in	(revision 1)
+++ asterisk-1.4.10.1/makeopts.in	(working copy)
@@ -3,7 +3,7 @@
 #       dependencies in menuselect for the same package.
 
 CC=@PTHREAD_CC@
-HOST_CC=cc
+HOST_CC=gcc
 CXX=@CXX@
 
 INSTALL=@INSTALL@
Index: asterisk-1.4.10.1/utils/smsq.c
===================================================================
--- asterisk-1.4.10.1/utils/smsq.c	(revision 1)
+++ asterisk-1.4.10.1/utils/smsq.c	(working copy)
@@ -26,6 +26,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
+#undef swab
 #include <unistd.h>
 #include <time.h>