Index: main/channel.c
===================================================================
--- main/channel.c	(revision 200768)
+++ main/channel.c	(working copy)
@@ -67,6 +67,10 @@
 #include <sys/epoll.h>
 #endif
 
+#ifndef MAX
+#define MAX(a,b) ((a) > (b) ? (a) : (b))
+#endif
+
 struct ast_epoll_data {
 	struct ast_channel *chan;
 	int which;
Index: Makefile
===================================================================
--- Makefile	(revision 200768)
+++ Makefile	(working copy)
@@ -276,7 +276,7 @@
 endif
 
 ifeq ($(OSARCH),SunOS)
-  ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include -D_XPG4_2
+  ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include -D_XPG4_2 -D__EXTENSIONS__
 endif
 
 ASTERISKVERSION:=$(shell GREP=$(GREP) AWK=$(AWK) build_tools/make_version .)