diff --git a/src/mesa/glapi/glapi.c b/src/mesa/glapi/glapi.c
index 11cc56d559e..7d0ceb50924 100644
--- a/src/mesa/glapi/glapi.c
+++ b/src/mesa/glapi/glapi.c
@@ -1,4 +1,4 @@
-/* $Id: glapi.c,v 1.38 2000/03/19 01:10:11 brianp Exp $ */
+/* $Id: glapi.c,v 1.39 2000/03/27 21:13:58 rjfrank Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -73,6 +73,17 @@ static _glthread_TSD ContextTSD;
 static GLuint MaxDispatchOffset = sizeof(struct _glapi_table) / sizeof(void *) - 1;
 static GLboolean GetSizeCalled = GL_FALSE;
 
+/* strdup is actually not a standard ANSI C or POSIX routine
+   Irix will not define it if ANSI mode is in effect. */
+static char *mesaStrdup(const char *str)
+{
+	char	*copy;
+	copy = (char*) malloc(strlen(str) + 1);
+	if (!copy) return(NULL);
+	strcpy(copy,str);
+	return(copy);
+}
+
 
 
 /*
@@ -1332,7 +1343,7 @@ _glapi_add_entrypoint(const char *funcName, GLuint offset)
          if (!entrypoint)
             return GL_FALSE;
 
-         ExtEntryTable[NumExtEntryPoints].Name = strdup(funcName);
+         ExtEntryTable[NumExtEntryPoints].Name = mesaStrdup(funcName);
          ExtEntryTable[NumExtEntryPoints].Offset = offset;
          ExtEntryTable[NumExtEntryPoints].Address = entrypoint;
          NumExtEntryPoints++;
@@ -1377,7 +1388,7 @@ _glapi_add_entrypoint2(const char *funcName)
       entryPoint = generate_entrypoint(offset);
       if (entryPoint) {
          NextFreeOffset++;
-         ExtEntryTable[NumExtEntryPoints].Name = strdup(funcName);
+         ExtEntryTable[NumExtEntryPoints].Name = mesaStrdup(funcName);
          ExtEntryTable[NumExtEntryPoints].Offset = offset;
          ExtEntryTable[NumExtEntryPoints].Address = entryPoint;
          NumExtEntryPoints++;
diff --git a/src/mesa/x86/x86.c b/src/mesa/x86/x86.c
index 02465fa14df..ee6da37b2d3 100644
--- a/src/mesa/x86/x86.c
+++ b/src/mesa/x86/x86.c
@@ -1,4 +1,4 @@
-/* $Id: x86.c,v 1.3 1999/11/12 04:57:23 kendallb Exp $ */
+/* $Id: x86.c,v 1.4 2000/03/27 21:13:58 rjfrank Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -40,6 +40,7 @@
 #include "xform.h"
 #include "x86.h"
 
+#ifdef USE_X86_ASM
 extern void _ASMAPI gl_v16_x86_cliptest_points4(GLfloat *first_vert,
 					GLfloat *last_vert,
 					GLubyte *or_mask,
@@ -52,7 +53,7 @@ extern void _ASMAPI gl_v16_x86_general_xform(GLfloat *dest,
 				     const GLfloat *src,
 				     GLuint src_stride,
 				     GLuint count);
-
+#endif
 
 
 #define XFORM_ARGS 	GLvector4f *to_vec, 		\