diff --git a/configure.in b/configure.in
index f8f4f655f15f..b0e0dd62a489 100644
--- a/configure.in
+++ b/configure.in
@@ -152,7 +152,10 @@ alpha-*-linux*)
 
 *-irix*)
     AC_DEFINE(IRIX6_3)
-
+    DSO_LDOPTS='-elf -shared -all'
+    LD_ALL='-all'
+    LD_NONE='-none'
+    CFLAGS="$CFLAGS -woff 3262" ;;
 
 esac
 
diff --git a/webshell/tests/viewer/Makefile.in b/webshell/tests/viewer/Makefile.in
index e7bc0aa49155..b3891c422493 100644
--- a/webshell/tests/viewer/Makefile.in
+++ b/webshell/tests/viewer/Makefile.in
@@ -154,7 +154,7 @@ ifeq ($(OS_ARCH),Linux)
 	$(CCC) -rdynamic -o $@ $(OBJS) $(LDFLAGS) $(EX_LIBS) $(NSPR_LIBS) $(TOOLKIT_LIBS) $(XLDFLAGS) $(XLIBS) $(OS_LIBS)
 else
 ifeq ($(OS_ARCH),IRIX)
-	$(CCC) -o $@ -woff 84,85 $(LDFLAGS) $(OBJS) $(EX_LIBS) $(NSPR_LIBS) $(TOOLKIT_LIB) $(XLDFLAGS) $(XLIBS) $(OS_LIBS)
+	$(CCC) -o $@ -woff 84,85 $(LDFLAGS) $(OBJS) $(EX_LIBS) $(NSPR_LIBS) $(TOOLKIT_LIBS) $(XLDFLAGS) $(XLIBS) $(OS_LIBS)
 else
 	$(CCC) -o $@ $(LDFLAGS) $(OBJS) $(EX_LIBS) $(NSPR_LIBS) $(TOOLKIT_LIBS) $(XLDFLAGS) $(XLIBS) $(OS_LIBS)
 endif
diff --git a/xpfe/xpviewer/src/nsBrowserWindow.cpp b/xpfe/xpviewer/src/nsBrowserWindow.cpp
index bcd80aa9d94c..896400a4fd70 100644
--- a/xpfe/xpviewer/src/nsBrowserWindow.cpp
+++ b/xpfe/xpviewer/src/nsBrowserWindow.cpp
@@ -89,6 +89,7 @@
 #include <strstrea.h>
 #else
 #include <strstream.h>
+#include <ctype.h>
 #endif
 
 #if defined(WIN32)